代码调整，bug修改

pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java

@@ -1,6 +1,7 @@
 package com.njcn.system.controller;
 
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +47,7 @@ public class ConfigController extends BaseController {
     private final IConfigService iConfigService;
 
 
+
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getSysConfig")
     @ApiOperation("获取系统配置")
@@ -68,7 +71,8 @@ public class ConfigController extends BaseController {
     public HttpResult<List<Config>> getSysConfigData() {
         String methodDescribe = getMethodDescribe("getSysConfigData");
         LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe);
-        List<Config> res = iConfigService.list();
+        List<Config> res = iConfigService.getList();
+
         if (CollectionUtils.isEmpty(res)) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
         } else {

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ConfigMapper.java

@@ -1,8 +1,11 @@
 package com.njcn.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.system.pojo.po.Config;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,5 @@ import com.njcn.system.pojo.po.Config;
  */
 public interface ConfigMapper extends BaseMapper<Config> {
 
+    List<Config> getList();
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ConfigMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.system.mapper.ConfigMapper">
 
+
+    <select id="getList" resultType="Config">
+        SELECT
+        sys_config.*,
+        sys_usera.NAME AS createBy,
+        sys_userb.NAME AS updateBy
+        FROM
+        sys_config sys_config
+        LEFT JOIN sys_user sys_usera ON sys_config.create_by = sys_usera.id
+        LEFT JOIN sys_user sys_userb ON sys_config.update_by = sys_userb.id
+        WHERE
+        sys_config.state = 1
+        ORDER BY
+        sys_config.create_time DESC
+    </select>
 </mapper>

pqs-system/system-boot/src/main/java/com/njcn/system/service/IConfigService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.system.pojo.param.ConfigParam;
 import com.njcn.system.pojo.po.Config;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -26,4 +28,6 @@ public interface IConfigService extends IService<Config> {
      * @return
      */
     boolean updateSysConfig(ConfigParam.ConfigUpdateParam configUpdateParam);
+
+    List<Config> getList();
 }

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ConfigServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,5 +51,10 @@ public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> impleme
         return false;
     }
 
+    @Override
+    public List<Config> getList() {
+        return this.baseMapper.getList();
+    }
+
 
 }