1、增加登录查询系统参数

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -113,6 +113,13 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     String getSettingValue(Map param);
 
     /**
+     * @desc : getAllSettingValue 函数查询所有系统参数
+     * @author : 周兴
+     * @date : 2024/4/1 10:27
+     */
+    Map<String, Object> getAllSettingValue();
+
+    /**
      * @desc : f_get_setting_values 函数查询多个系统参数
      * @author : 周兴
      * @date : 2023/1/30 10:27

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -286,14 +286,19 @@
 
     <!--    函数查询单个系统参数-->
     <select id="getSettingValue" resultType="String">
-        select dkic_b.f_get_setting_value(#{code}, #{ftyId})
+        select dkic_b.f_get_setting_value(#{code}, #{cpId})
+    </select>
+
+    <!--    函数查询所有系统参数-->
+    <select id="getAllSettingValue" resultType="Map">
+        select f_get_all_setting_value AS "setting" from dkic_b.f_get_all_setting_value(#{cpId})
     </select>
 
 
     <!--    函数查询多个系统参数-->
     <select id="getSettingValues" resultType="Map">
         select core.f_get_setting_values(
-                       #{codes, typeHandler=StringListTypeHandler}, #{ftyId})
+                       #{codes, typeHandler=StringListTypeHandler}, #{cpId})
     </select>
 
     <!--  查询系统参数分类  -->

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -14,10 +14,12 @@ import com.dk.mdm.feign.CompanyFeign;
 import com.dk.mdm.infrastructure.convert.mst.StaffConvert;
 import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.mapper.common.CommonMapper;
+import com.dk.mdm.mapper.mst.ComMenuMapper;
 import com.dk.mdm.model.pojo.mst.*;
 import com.dk.mdm.mapper.mst.StaffMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.mst.ComMenuQuery;
 import com.dk.mdm.model.query.mst.StaffQuery;
 import com.dk.common.model.response.mst.StaffResponse;
 import com.dk.common.model.vo.mst.StaffVO;
@@ -75,6 +77,9 @@ public class StaffService extends BaseService<Staff> {
     private CommonMapper commonMapper;
 
     @Autowired
+    private ComMenuService comMenuService;
+
+    @Autowired
     private AuthUtils authUtils;
 
     /**
@@ -259,7 +264,6 @@ public class StaffService extends BaseService<Staff> {
             return ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
         }
 
-
         return ResponseResultUtil.success();
     }
 
@@ -290,8 +294,15 @@ public class StaffService extends BaseService<Staff> {
 
         // 获取菜单
         List menuList = commonMapper.getMenuByUser(param);
+        // 获取常用菜单
+        ResponseResultVO<?> comMenuList = comMenuService.selectMenu(new ComMenuQuery().setStaffId(staff.getStaffId())
+                .setAppCode(param.get("appCode").toString()));
+        // 获取所有参数
+        Map<String, Object> allSettingValue = commonMapper.getAllSettingValue();
         Dictionary<String,Object> dic = new Hashtable<>();
         dic.put("menuList", menuList);
+        dic.put("comMenuList", comMenuList.getData());
+        dic.put("settingValue", allSettingValue);
         dic.put("staff",staff);
         return ResponseResultUtil.success(dic);
     }