DESKTOP-2K9OVK9\siwei 1 miesiąc temu
rodzic
commit
e17a7779f3

+ 2 - 9
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/zrzysite/impl/ZrzysiteCommonServiceImpl.java

@@ -138,17 +138,15 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
 
                 //如果用户手动修改过的数据直接用户操作为准,不再同步
                 if(JsgcghxkList.stream().anyMatch(obj ->
-                        !DateUtils.isSameMinute(obj.getCreatedAt(), obj.getUpdatedAt())
-                                && StringUtils.isNotBlank(obj.getZsbh())
+                                StringUtils.isNotBlank(obj.getZsbh())
                                 && StringUtils.isNotBlank(obj.getFzDate()))){
                     continue;
                 }
 
                 //找出同步过的数据,不再同步
-                List<String> sourceIdList = new ArrayList<>();
                 List<String>  resSourceIdList =  JsgcghxkList.stream().map(Jsgcghxk::getSourceId).filter(StringUtils::isNotBlank).collect(Collectors.toList());
                 if(!resSourceIdList.isEmpty()){
-                    sourceIdList = new ArrayList<>(resSourceIdList);
+                   continue;
                 }
 
                 //找出需要更新的节点id
@@ -156,11 +154,6 @@ public class ZrzysiteCommonServiceImpl implements IZrzysiteCommonService {
 
                 String addNodeId = "";
                 for (ZrzysiteConstruct construct : constructList) {
-                    if(sourceIdList.contains(construct.getSqbh())){
-                        //说明已经同步过了
-                        continue;
-                    }
-
                     String needUpdateNodeId  = "";
                     // 取出头部元素并从集合删除
                     if (!needUpdateNodeIdList.isEmpty()) {