From e0f70a0ef4e92af4b3aa24d985c6bd944e53cde3 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 16 Jan 2025 15:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93#1001=E3=80=81#1006=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/systemconfig/vo/ConfigPageReqVO.java         |  2 ++
 .../impl/DefaultSystemConfigServiceHandler.java        | 10 +++++++++-
 .../system/service/user/AdminUserServiceImpl.java      |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigPageReqVO.java
index 611be24e1..89b18540f 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigPageReqVO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigPageReqVO.java
@@ -4,6 +4,7 @@ import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.module.system.validation.common.CommonStatus;
 import com.cf.imes.module.system.validation.config.SystemConfigTypeEnumValid;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,6 +19,7 @@ import javax.validation.constraints.Size;
 @Schema(description = "管理后台 - 系统配置分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Builder
 public class ConfigPageReqVO extends PageParam {
 
     @Schema(description = "配置项名称", example = "晨丰")
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java
index 4ca0e5ee7..47046fe21 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java
@@ -30,13 +30,18 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi
     @Resource
     private SystemConfigMapper systemConfigMapper;
 
+    @Resource
+    private CustomPlateNoServiceHandler customPlateNoServiceHandler;
+
     @Override
     public List<SystemConfigDO> selectList(ConfigPageReqVO reqVO) {
 
         // 查询所有的 SystemConfigTypeEnum 类型
         List<SystemConfigTypeEnum> allConfigTypes = Arrays.asList(SystemConfigTypeEnum.values());
 
-        List<SystemConfigTypeEnum> list = allConfigTypes.stream().filter(f -> !f.getType().equals(3)).toList();
+        // 自定义板编号、高级筛选不走通用分页查询
+        List<SystemConfigTypeEnum> list = allConfigTypes.stream()
+                .filter(f -> ObjectUtil.notEqual(SystemConfigTypeEnum.ADVANCED_SCREEN.getType(), f.getType()) && ObjectUtil.notEqual(SystemConfigTypeEnum.CUSTOM_PLATE_NO.getType(), f.getType())).toList();
 
         List<SystemConfigDO> systemConfigDOS = systemConfigMapper.selectList(new LambdaQueryWrapperX<SystemConfigDO>()
                 .likeIfPresent(SystemConfigDO::getName, reqVO.getName())
@@ -88,6 +93,9 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi
             }
         }
 
+        // 增加自定义板编号配置
+        List<SystemConfigDO> customPlateNoConfigList = customPlateNoServiceHandler.selectList(ConfigPageReqVO.builder().type(SystemConfigTypeEnum.CUSTOM_PLATE_NO.getType()).build());
+        resultList.addAll(0, customPlateNoConfigList);
         return resultList;
     }
 
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
index bad0ec839..f43c9a08f 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
@@ -305,6 +305,8 @@ public class AdminUserServiceImpl implements AdminUserService {
         // 更新密码
         AdminUserDO updateObj = new AdminUserDO();
         updateObj.setId(id);
+        // 校验密码
+        validatePassword(password);
         updateObj.setPassword(encodePassword(password)); // 加密密码
         userMapper.updateById(updateObj);
     }