update

TEAMModelOS.SDK/DI/DingDing/DingDing.cs

@@ -32,14 +32,18 @@ namespace TEAMModelOS.SDK.DI
         /// <param name="secret">加簽密鑰</param>
         /// <param name="msg">發送訊息</param>
         /// <returns></returns>
-        public async Task SendBotMarkdown(string title , string text, GroupNames groupkey)
+        public async Task SendBotMarkdown(string title , string text, GroupNames groupkey, List<string> mobiles = null)
         {
             // TODO　有空處理自動抓取方法名，代碼行數顯示
             //StackTrace st = new StackTrace(new StackFrame(1, true));
             //StackFrame sf = st.GetFrame(0);            
             //var f = $"Func：{sf.GetMethod().Name}，Line ： {sf.GetFileLineNumber()}";
-
-            var content = new { msgtype = "markdown", markdown = new { title= title, text = text } };
+            List<string> atMobiles = new List<string>();
+            if (mobiles.IsNotEmpty())
+            {
+                atMobiles=mobiles;
+            }
+            var content = new { msgtype = "markdown", markdown = new { title= title, text = text }, at = new { atMobiles } };
 #if DEBUG
             var keys = GroupNames.成都开发測試群組.GetDescriptionText().Split(',');
 #else

TEAMModelOS/Controllers/Both/CourseBaseController.cs

@@ -1440,7 +1440,14 @@ namespace TEAMModelOS.Controllers.Both
                                         if (classes.Count > 1)
                                         {
                                             ///班级入学年-编号重复的班级
-                                            duplicateClasses.Add(item.list, classes);
+
+                                            if (duplicateClasses.ContainsKey(item.list))
+                                            {
+                                                duplicateClasses[item.list].AddRange(classes);
+                                            }
+                                            else {
+                                                duplicateClasses.TryAdd(item.list, classes);
+                                            }
                                             //导入的班级入学年-编号在系统中重复，请检查行政班设置。
                                             item.invalidCode = 13;
                                             courseInvalidImports.Add(item);