校验

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@@ -61,6 +61,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 /**
  * 党群服务中心
@@ -259,7 +260,12 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             records.forEach(r -> {
                 timeIds.addAll(Arrays.asList(r.getTimeId().split(",")));
             });
-            if (timeIds.containsAll(Arrays.asList(formDTO.getTimeId().split(",")))){
+            List<String> formTimeId = Arrays.asList(formDTO.getTimeId().split(","));
+            int before = timeIds.size() + formTimeId.size();
+            List<String> endTimeId = new ArrayList<>();
+            endTimeId.addAll(timeIds);endTimeId.addAll(formTimeId);
+            List<String> collect = endTimeId.stream().distinct().collect(Collectors.toList());
+            if (collect.size() < before){
                 throw new RenException(EpmetErrorCode.APPOINTMENT_TIME_ERROR.getCode());
             }
         }