CrazyIter_Bin 6 hónapja
szülő
commit
4b40e4fa2a

+ 12 - 7
TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -1152,12 +1152,16 @@ namespace TEAMModelOS.SDK
                 //這邊整理出不存在的教室,之後創建新教室用(比對classNo)。
                 //var nonexistentClassNo = classNos.Except(classInfos.Select(o => o.Key).ToList());
                 List<string> exsitkey = new List<string>();
-                foreach (var classInfo in classInfos)
+                if (classInfos!=null)
                 {
-                    //$"{studentInfo.periodId}_{year}_{tmpClassNo.GetString()}"
-                    var key = $"{classInfo.Value.periodId}_{classInfo.Value.year}_{classInfo.Value.no}";
-                    exsitkey.Add(key);
+                    foreach (var classInfo in classInfos)
+                    {
+                        //$"{studentInfo.periodId}_{year}_{tmpClassNo.GetString()}"
+                        var key = $"{classInfo.Value.periodId}_{classInfo.Value.year}_{classInfo.Value.no}";
+                        exsitkey.Add(key);
+                    }
                 }
+               
                 List<KeyValuePair<string, (string className, string periodId, int year, string no)>> nonexistentClassNo = new List<KeyValuePair<string, (string className, string periodId, int year, string no)>>();
                 foreach (var key in sortedImpData.classInfo.Keys)
                 {
@@ -2470,9 +2474,10 @@ namespace TEAMModelOS.SDK
         /// <returns></returns>
         private static async Task<Dictionary<string, Class>> getClassInfoUseNo(AzureCosmosFactory _azureCosmos, DingDing _dingDing, Option _option, string schoolId, Dictionary<string, (string className, string periodId, int year, string no)> classNos)
         {
+            Dictionary<string, Class> dicClassInfo = new Dictionary<string, Class>();
             try
             {
-                Dictionary<string, Class> dicClassInfo = new Dictionary<string, Class>();
+               
                 if (!(classNos == null || classNos.Count == 0))
                 {
 
@@ -2489,7 +2494,7 @@ namespace TEAMModelOS.SDK
                     }
                     return dicClassInfo;
                 }
-                else return null;
+                else return dicClassInfo;
 
             }
             catch (CosmosException ex)
@@ -2500,7 +2505,7 @@ namespace TEAMModelOS.SDK
             {
                 await _dingDing.SendBotMsg($"IES5,{_option.Location},StudentController/getClassInfoUseId()\n{ex.Message}\n{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
             }
-            return null;
+            return dicClassInfo;
         }
 
         /// <summary>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 28 - 28
TEAMModelOS/appsettings.Development.json