From d408ca88af65121ba9f0797fd3f1b279a29e6618 Mon Sep 17 00:00:00 2001
From: liguoqing <1576331433@qq.com>
Date: Mon, 1 Feb 2021 20:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90config-business=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9createWrapper=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysConfigController.java       |  2 +-
 .../modular/service/SysConfigService.java     |  2 +-
 .../service/impl/SysConfigServiceImpl.java    | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigController.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigController.java
index 61fc00eff..ff671c002 100644
--- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigController.java
+++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/controller/SysConfigController.java
@@ -59,7 +59,7 @@ public class SysConfigController {
      */
     @PostResource(name = "删除系统参数配置", path = "/sysConfig/delete")
     public ResponseData delete(@RequestBody @Validated(SysConfigParam.delete.class) SysConfigParam sysConfigParam) {
-        sysConfigService.delete(sysConfigParam);
+        sysConfigService.del(sysConfigParam);
         return new SuccessResponseData();
     }
 
diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigService.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigService.java
index d567b875b..40afa29e7 100644
--- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigService.java
+++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/SysConfigService.java
@@ -64,7 +64,7 @@ public interface SysConfigService extends IService<SysConfig> {
      * @author fengshuonan
      * @date 2020/4/14 11:15
      */
-    void delete(SysConfigParam sysConfigParam);
+    void del(SysConfigParam sysConfigParam);
 
     /**
      * 查看系统参数配置
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 094aef325..e2c8f44bb 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
@@ -69,7 +69,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(SysConfigParam sysConfigParam) {
+    public void del(SysConfigParam sysConfigParam) {
 
         // 1.根据id获取常量
         SysConfig sysConfig = this.querySysConfig(sysConfigParam);
@@ -135,20 +135,20 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
 
         if (ObjectUtil.isNotNull(sysConfigParam)) {
+
+            String configName = sysConfigParam.getConfigName();
+            String configCode = sysConfigParam.getConfigCode();
+            String groupCode = sysConfigParam.getGroupCode();
+
             // 如果名称不为空，则带上名称搜素搜条件
-            if (ObjectUtil.isNotEmpty(sysConfigParam.getConfigName())) {
-                queryWrapper.like(SysConfig::getConfigName, sysConfigParam.getConfigName());
-            }
+            queryWrapper.like(ObjectUtil.isNotEmpty(configName), SysConfig::getConfigName, configName);
 
             // 如果常量编码不为空，则带上常量编码搜素搜条件
-            if (ObjectUtil.isNotEmpty(sysConfigParam.getConfigCode())) {
-                queryWrapper.like(SysConfig::getConfigCode, sysConfigParam.getConfigCode());
-            }
+            queryWrapper.like(ObjectUtil.isNotEmpty(configCode), SysConfig::getConfigCode, configCode);
 
             // 如果分类编码不为空，则带上分类编码
-            if (ObjectUtil.isNotEmpty(sysConfigParam.getGroupCode())) {
-                queryWrapper.eq(SysConfig::getGroupCode, sysConfigParam.getGroupCode());
-            }
+            queryWrapper.eq(ObjectUtil.isNotEmpty(groupCode), SysConfig::getGroupCode, groupCode);
+
         }
 
         // 查询未删除的