From 1106e0de2733052b797a3aa4ba32eb131e8fa8fd Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 27 Jun 2022 11:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ParamsCollectManifestEOController.java       | 6 +++++-
 .../collect/mapper/xml/ParamsCollectManifestEOMapper.xml    | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 99c980b9c..0066aa527 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -380,7 +380,11 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	public Result<?> lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
 		boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO);
 		if (isSuccess) {
-			return Result.OK("冻结配置成功！");
+			if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsConfigIds())) {
+				return Result.OK("解冻配置成功！");
+			} else {
+				return Result.OK("冻结配置成功！");
+			}
 		} else {
 			return Result.error("冻结配置失败！");
 		}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 0f5304025..9802182e9 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -53,13 +53,13 @@
                 <if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
                     <choose>
                         <when test="paramsCollectManifestEO.userTypes == 'sdt'">
-                            AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1'
+                            AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7')
                         </when>
                         <when test="paramsCollectManifestEO.userTypes == 'dre'">
-                            AND dre = #{paramsCollectManifestEO.dreForAuth}
+                            AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8')
                         </when>
                         <when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
-                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state != '1'
+                            AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state in ('2','4','5','6','7','8')
                         </when>
                         <when test="paramsCollectManifestEO.userTypes == 'guest'">
                             AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})