diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java index 79aed2732..66497e08d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java @@ -116,11 +116,13 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl updateList = paramsCollectManifestEOList.stream() - .filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList()); + .filter(e -> (!CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) + && !CollectManifestStateEnum.CHANGE.getValue().equals(e.getState()))) + .collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(updateList)) { List updateCollectManifestEOList = new ArrayList<>(); updateList.forEach(collectManifestEO -> { - ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); + ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); updateCollectManifestEO.setId(collectManifestEO.getId()); updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue()); updateCollectManifestEOList.add(updateCollectManifestEO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 1f2dfcac3..050b2fb3f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -596,7 +596,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl