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 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 @@ - AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1' + AND sdt = #{paramsCollectManifestEO.sdt} AND state in ('2','4','5','6','7') - AND dre = #{paramsCollectManifestEO.dreForAuth} + AND dre = #{paramsCollectManifestEO.dreForAuth} AND state in ('4','6','7','8') - 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') AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})