Merge branch 'develop' into release/v20210707Develop新二次分配合并

performance/Performance.Services/ConfigService.cs

@@ -458,11 +458,17 @@ public bool DrugtypeDisburseDelete(DrugpropRequest request)
         public void SaveDrugtypeDisburse(int allotId)
         {            
             var Disburse = drugtypeDisburseRepository.GetEntities(t => t.AllotID == allotId);
+            if (Disburse == null || !Disburse.Any()) return;
+
             var perSheet = perforPersheetRepository.GetEntities(t => t.AllotID == allotId && t.SheetType == (int)SheetType.Expend);
+            if (perSheet == null || !perSheet.Any()) return;
+
             var TypeNames = imdataRepository.GetEntities(t => perSheet.Select(c => c.ID).Contains(t.SheetID.Value)).Select(t => t.TypeName).Distinct().ToList();
+            if (TypeNames == null || !TypeNames.Any()) return;
+
             var except = Disburse.Select(t => t.Charge).Distinct().Intersect(TypeNames);
 
-            if (except != null || !except.Any())
+            if (except != null || except.Any())
             {
                 foreach (var item in except)
                 {