update

TEAMModelOS/Controllers/Research/AbilityStatisticsController.cs

@@ -237,6 +237,7 @@ namespace TEAMModelOS.Controllers
                 long   totalTime=teacherTrains.Select(x => x.totalTime).Sum();
                 int  hgcount  = teacherTrains.Where(x => x.finalScore==1||x.finalScore==2).Count();
                 var  teacherAilities = teacherTrains.SelectMany(x => x.currency.teacherAilities);
+                setting.accessConfig = null;
                 return Ok(new { teacherTrains, setting, schools= schoolInfos , totalTime, hgcount, teacherAilities, teacherCount = countArea, appraiseCount = appraiseArea });
             }
             catch (Exception ex)
@@ -343,7 +344,7 @@ namespace TEAMModelOS.Controllers
 
                 //    await client.GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync<TeacherTrain>(teacherTrain, new PartitionKey($"TeacherTrain-{school}"));
                 //}
-               
+                setting.accessConfig = null;
                 return Ok(new { teacherTrains, setting, teacherCount=count, appraiseCount=appraise, yxtrain   });
             }
             catch (Exception ex)
@@ -429,10 +430,13 @@ namespace TEAMModelOS.Controllers
                     teacherTrain= await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemAsync<TeacherTrain>(tmdid, new PartitionKey($"TeacherTrain-{school}"));
                     teacherTrain.name = name;
                     teacherTrain.picture=picture;
-                    if (update!=null && update.Count > 0) {
+                    if (update!=null && update.Count > 0 ) {
                         foreach (var up in update) {
                             teacherTrain.update.Add(up);
                         }
+                        
+                    }
+                    if (teacherTrain.update.Count>0) {
                         await StatisticsService.StatisticsTeacher(teacherTrain, setting, area, client, null);
                     }
                 }
@@ -450,6 +454,7 @@ namespace TEAMModelOS.Controllers
                         StatisticsService.TeacherClass, StatisticsService.OfflineRecord }
                     }, setting, area, client,null);
                 }
+                setting.accessConfig = null;
                 return Ok(new { teacherTrain , setting });
             } catch (Exception ex) { 
                 return BadRequest(new { ex.Message ,ex.StackTrace});

TEAMModelOS/Controllers/Research/AbilitySubController.cs

@@ -207,7 +207,7 @@ namespace TEAMModelOS.Controllers
                         abilitys.ForEach(x => { x.currency = 1; });
                         currencyAb1 = abilitys;
                         //同时处理 原有设置必修的能力点。
-                        hadSubs.FindAll(x => x.currency == 1).ForEach(y => { y.currency = 0; });
+                        hadSubs.FindAll(x => abilitys.Exists(z=>z.id.Equals(x.id))).ForEach(y => { y.currency = 1; });
                         from = 1;
                     }
                     else
@@ -221,6 +221,7 @@ namespace TEAMModelOS.Controllers
                     var had = hadSubs.Where(x => x.id.Equals(item.id)).FirstOrDefault();
                     if (had == null)
                     {
+                        item.currency = 2;
                         hadSubs.Add(item);
                         AbilitySub abilitySub = new AbilitySub
                         {
@@ -246,6 +247,7 @@ namespace TEAMModelOS.Controllers
                         var had = hadSubs.Where(x => x.id.Equals(item.id)).FirstOrDefault();
                         if (had == null)
                         {
+                            item.currency = 1;
                             hadSubs.Add(item);
                             AbilitySub abilitySub = new AbilitySub
                             {