Merge branch 'develop' into 手工录入_

performance/Performance.Services/SecondAllot/SecondAllotService.cs

@@ -511,8 +511,8 @@ public void SaveSecondAllotHeadData(int secondId, string json)
 
             List<ag_worktype_source> insertData = new List<ag_worktype_source>();
             var worktypeSources = agworktypesourceRepository.GetEntities(t => t.SecondId == secondId);
-            if (worktypeSources == null || !worktypeSources.Any())
-            {
+
+            //多工作量
             var workTypes = agworkloadtypeRepository.GetEntities();
             var workValue = new List<int>();
             foreach (var item in keys)
@@ -542,13 +542,19 @@ public void SaveSecondAllotHeadData(int secondId, string json)
 
                 }
             }
-                agworktypesourceRepository.AddRange(insertData.ToArray());
+            foreach (var k in worktypeSources.Select(t => t.FieldId))
+            {
+                var remove = insertData.FirstOrDefault(t => t.FieldId.EqualsIgnoreCase(k));
+                if (remove != null)
+                {
+                    insertData.Remove(remove);
+                }
             }
 
+            agworktypesourceRepository.AddRange(insertData.ToArray());
 
             worktypeSources = agworktypesourceRepository.GetEntities(t => t.SecondId == secondId);
 
-
             foreach (var key in keys)
             {
                 var update = worktypeSources.FirstOrDefault(t => t.FieldId.EqualsIgnoreCase(key));