From eb235ae154e9908582d1a7aa1f300c5d869811cc Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Mon, 22 Jan 2024 17:38:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E9=A4=90=E6=AC=A1guid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/BalanceService.cs     | 22 +++++++++++--------
 Src/Dlhis.Canteen/Program.cs                  |  2 ++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 16eab682..bb3c60e7 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -506,19 +506,23 @@ public class BalanceService : IBalanceService
 
     private async Task<Dictionary<string, string>> GetShiftCode()
     {
-        var list = await _dbContext.Queryable<BasicTypeEntity>().Where(x => x.Type == "mealshift").ToListAsync();
 
         var shiftCodeDict = new Dictionary<string, string>();
 
-        var breakfastCode = list.FirstOrDefault(x => x.Code == "shift-breakfast")?.Code;
-        var lunchCode = list.FirstOrDefault(x => x.Code == "shift-lunch")?.Code;
-        var dinnerCode = list.FirstOrDefault(x => x.Code == "shift-dinner")?.Code;
-        var lateNightCode = list.FirstOrDefault(x => x.Code == "shift-midnightsnack")?.Code;
+        var shifts = await _dbContext.Queryable<CanteenBusinessShiftEntity>().ToListAsync();
+        //guid
+        var breakfastCode =  shifts.Where(x=>x.CustomCode == "shift-breakfast").Select(x => x.Code).First().ToString();
 
-        shiftCodeDict.Add("Breakfast", breakfastCode);
-        shiftCodeDict.Add("Lunch", lunchCode);
-        shiftCodeDict.Add("Dinner", dinnerCode);
-        shiftCodeDict.Add("LateNight", lateNightCode);
+        var lunchCode = shifts.Where(x => x.CustomCode == "shift-lunch").Select(x => x.Code).First().ToString();
+
+        var dinnerCode = shifts.Where(x => x.CustomCode == "shift-dinner").Select(x => x.Code).First().ToString();
+
+        var lateNightCode = shifts.Where(x => x.CustomCode == "shift-midnightsnack").Select(x => x.Code).First().ToString();
+
+        shiftCodeDict.Add("Breakfast", breakfastCode.ToString());
+        shiftCodeDict.Add("Lunch", lunchCode.ToString());
+        shiftCodeDict.Add("Dinner", dinnerCode.ToString());
+        shiftCodeDict.Add("LateNight", lateNightCode.ToString());
 
         return shiftCodeDict;
     }
diff --git a/Src/Dlhis.Canteen/Program.cs b/Src/Dlhis.Canteen/Program.cs
index a8487e57..d64882de 100644
--- a/Src/Dlhis.Canteen/Program.cs
+++ b/Src/Dlhis.Canteen/Program.cs
@@ -1,5 +1,6 @@
 using Kurisu.AspNetCore.Startup;
 using Kurisu.Startup;
+using Microsoft.IdentityModel.Logging;
 
 namespace Dlhis.Canteen;
 
@@ -15,5 +16,6 @@ public class Startup : DefaultStartup
 {
     public Startup(IConfiguration configuration) : base(configuration)
     {
+        IdentityModelEventSource.ShowPII = true;
     }
 }
\ No newline at end of file