保底配置修改-过滤重复数据

performance/Performance.Services/GuaranteeService.cs

@@ -106,7 +106,11 @@ public List<cof_guarantee> GuarantUpdate(GuaranteeRequest request)
             if (guaranteeList == null)
                 throw new PerformanceException("提交数据无效");
             var filterList = perforCofguaranteeRepository.GetEntities(t => t.AllotId == guarantee.AllotId && t.UnitType == request.UnitType && t.Target == request.Target);
+<<<<<<< HEAD
             if ((filterList != null && filterList.Count > 0) && (request.UnitType != guarantee.UnitType || request.Target != guarantee.Target))
+=======
+            if (request.UnitType != guarantee.UnitType && filterList != null && filterList.Count > 0)
+>>>>>>> 50ad63f... 保底配置修改-过滤重复数据
                 throw new PerformanceException($"[{((UnitType)request.UnitType).ToString()}]已存在\"{request.Target}\",请重新选择");
 
             #region 修改优先级
@@ -167,7 +171,7 @@ public List<cof_guarantee> GuarantUpdate(GuaranteeRequest request)
             var exist = request.Source.Where(t => t.GId.HasValue && t.GId != 0).Select(t => t.GId);
             guaranteeList.ForEach(t =>
             {
-                if (exist.Contains(t.Id))
+                if (exist.Contains(t.Id) && !filterList.Select(s => s.Source).Contains(t.Source))
                     t.Source = request.Source.FirstOrDefault(s => s.GId == t.Id).GValue;
                 else
                     delItem.Add(t.Id);