From 8575a72b30c40c1b2b8ebba2e591a2b9841e1790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 10 Aug 2023 09:40:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=EF=BC=8C=E5=8F=98=E6=9B=B4=E6=89=A9=E5=B1=95=E5=90=8E?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/service/impl/ParamsConfigEOServiceImpl.java     | 6 ++++--
 .../collect/service/impl/ParamsManifestEOServiceImpl.java   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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<ParamsConfigEOMapper,
 //			saveBatch(addConfigList);
 			// 修改所有参数项状态为：待发起收集
 			List<ParamsCollectManifestEO> 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<ParamsCollectManifestEO> 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<ParamsManifestEOMap
 
                     // 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边
                     updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id
-                    updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
+                    updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
                     updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); // 因新发布模板中该参数项控件变化，标记为变更后参数项
                     updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
                     updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项