From 826787f90149089bb2d9f49f50820f3a83c71760 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 10 Jul 2023 20:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90config=E3=80=91?=
 =?UTF-8?q?=E6=95=B4=E7=90=86config=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/pojo/param/SysConfigParam.java    |  6 +--
 .../service/impl/SysConfigServiceImpl.java    | 44 +++++++++----------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/pojo/param/SysConfigParam.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/pojo/param/SysConfigParam.java
index 532dfa552..6169ae689 100644
--- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/pojo/param/SysConfigParam.java
+++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/pojo/param/SysConfigParam.java
@@ -26,16 +26,14 @@ package cn.stylefeng.roses.kernel.config.modular.pojo.param;
 
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
-import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest.batchDelete;
 import cn.stylefeng.roses.kernel.validator.api.validators.flag.FlagValue;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Set;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.Set;
 
 /**
  * 系统参数配置参数
@@ -103,7 +101,7 @@ public class SysConfigParam extends BaseRequest {
     private String groupCode;
 
     /**
-     * 角色id集合，用在批量删除
+     * configId集合，用在批量删除
      */
     @NotEmpty(message = "configId集合不能为空", groups = batchDelete.class)
     @ChineseDescription("configId集合，用在批量删除")
diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java
index 0db8fbe15..ddcb09ec3 100644
--- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java
+++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java
@@ -298,10 +298,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         String searchText = sysConfigParam.getSearchText();
         if (ObjectUtil.isNotEmpty(searchText)) {
             queryWrapper.and(wq -> {
-            	wq.like(SysConfig::getConfigName, searchText)
-            	  .or().like(SysConfig::getConfigCode, searchText)
-            	  .or().like(SysConfig::getConfigValue, searchText)
-            	  .or().like(SysConfig::getRemark, searchText);
+                wq.like(SysConfig::getConfigName, searchText)
+                        .or().like(SysConfig::getConfigCode, searchText)
+                        .or().like(SysConfig::getConfigValue, searchText)
+                        .or().like(SysConfig::getRemark, searchText);
             });
         }
 
@@ -315,27 +315,27 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         return queryWrapper;
     }
 
-	@Override
-	public void batchDelete(SysConfigParam sysConfigParam) {
+    @Override
+    public void batchDelete(SysConfigParam sysConfigParam) {
 
-		for(Long configId:sysConfigParam.getConfigIdList()){
-			 // 1.根据id获取常量
-			SysConfig sysConfig = this.getById(configId);
-	        if (ObjectUtil.isEmpty(sysConfig) || sysConfig.getDelFlag().equals(YesOrNotEnum.Y.getCode())) {
-	            throw new ConfigException(ConfigExceptionEnum.CONFIG_NOT_EXIST, "id: " + sysConfigParam.getConfigId());
-	        }
+        for (Long configId : sysConfigParam.getConfigIdList()) {
+            // 1.根据id获取常量
+            SysConfig sysConfig = this.getById(configId);
+            if (ObjectUtil.isEmpty(sysConfig) || sysConfig.getDelFlag().equals(YesOrNotEnum.Y.getCode())) {
+                throw new ConfigException(ConfigExceptionEnum.CONFIG_NOT_EXIST, "id: " + sysConfigParam.getConfigId());
+            }
 
-	        // 2.不能删除系统参数
-	        if (YesOrNotEnum.Y.getCode().equals(configId)) {
-	            throw new ConfigException(ConfigExceptionEnum.CONFIG_SYS_CAN_NOT_DELETE);
-	        }
+            // 2.不能删除系统参数
+            if (YesOrNotEnum.Y.getCode().equals(sysConfig.getSysFlag())) {
+                throw new ConfigException(ConfigExceptionEnum.CONFIG_SYS_CAN_NOT_DELETE);
+            }
 
-	        // 3.逻辑删除
-	        this.removeById(configId);
+            // 3.逻辑删除
+            this.removeById(configId);
 
-	        // 4.删除对应context
-	        ConfigContext.me().deleteConfig(sysConfig.getConfigCode());
-		}
-	}
+            // 4.删除对应context
+            ConfigContext.me().deleteConfig(sysConfig.getConfigCode());
+        }
+    }
 
 }