zhouj1203@hotmail.com 2 年之前
父节点
当前提交
0348e3eb12
共有 2 个文件被更改,包括 17 次插入4 次删除
  1. 15 2
      TEAMModelOS.FunctionV4/CosmosDB/TriggerArt.cs
  2. 2 2
      TEAMModelOS/Controllers/Common/ArtController.cs

+ 15 - 2
TEAMModelOS.FunctionV4/CosmosDB/TriggerArt.cs

@@ -272,7 +272,13 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
                                         List<string> stus = new();
                                         foreach (var lost in stuInfo)
                                         {
-                                            stus = stus.Intersect(lost.stu).ToList();
+                                            if (stus.Count == 0)
+                                            {
+                                                stus = stus.Union(lost.stu).ToList();
+                                            }
+                                            else {
+                                                stus = stus.Intersect(lost.stu).ToList();
+                                            }                                          
                                             LostStudent lostStudent = new()
                                             {
                                                 code = lost.code,
@@ -301,7 +307,14 @@ namespace TEAMModelOS.FunctionV4.CosmosDB
                                     List<string> stus = new();
                                     foreach (var (code, sub, stu) in stuInfo)
                                     {
-                                        stus = stus.Intersect(stu).ToList();
+                                        if (stus.Count == 0)
+                                        {
+                                            stus = stus.Union(stu).ToList();
+                                        }
+                                        else
+                                        {
+                                            stus = stus.Intersect(stu).ToList();
+                                        }
                                         LostStudent lostStudent = new()
                                         {
                                             code = code,

+ 2 - 2
TEAMModelOS/Controllers/Common/ArtController.cs

@@ -823,11 +823,11 @@ namespace TEAMModelOS.Controllers.Common
                     }
                     if (!string.IsNullOrWhiteSpace(ae.id))
                     {
-                        return Ok(new { art, classes, ae, music, code = 200 });
+                        return Ok(new { art, classes, ae, music,count = rmembers.Count, code = 200 });
                     }
                     else
                     {
-                        return Ok(new { art, classes, music, code = 200 });
+                        return Ok(new { art, classes, music,count = rmembers.Count, code = 200 });
                     }