CrazyIter_Bin 1 year ago
parent
commit
eb1237330a

+ 1 - 1
TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -309,7 +309,7 @@ namespace TEAMModelOS.SDK
                     //状态=5 ,人数已满
                     return (5, item, null);
                 }
-                data = JoinList(item, userid, type, school,year);
+                data = JoinList(item, userid, type, school,year,seatNo);
                 //TODO 需要考虑已经通过别的途径加入名单,但是缓存数据仍记录数据的问题。 还要考虑手动加入过的。或者在获取名未加入名单成员的临时缓存数据的时候过滤已经加入的。
                 break;
             }

+ 4 - 2
TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -140,8 +140,10 @@ namespace TEAMModelOS.Controllers
             json.TryGetProperty("school", out JsonElement school);
             json.TryGetProperty("courseId", out JsonElement _courseId);
             int seatNo = 0;
-            if (json.TryGetProperty("seatNo", out JsonElement _seatNo)  &&  int.TryParse($"{_seatNo}", out seatNo)) { 
-
+            if (json.TryGetProperty("seatNo", out JsonElement _seatNo)  ) {
+                if (int.TryParse($"{_seatNo}", out int __seatNo)) {
+                    seatNo=__seatNo;
+                }
             }
             var client = _azureCosmos.GetCosmosClient();
             json.TryGetProperty("id_token", out JsonElement id_token);

+ 1 - 1
TEAMModelOS/TEAMModelOS.csproj

@@ -110,7 +110,7 @@
     <!-- Build Target: Restore NPM packages using npm -->
     <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
 
-    <Exec WorkingDirectory="$(SpaRoot)" Command="cnpm install" />
+    <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
   </Target>
 
   <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">