【7.2.5】获取所有审批人类型列表

kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java

@@ -87,4 +87,9 @@ public interface SystemConstants {
      */
     Long OAUTH2_USER_ROLE_ID = 1339550467939639305L;
 
+    /**
+     * 组织机构审批人类型的菜单
+     */
+    String APPROVER_TYPE_DICT_TYPE_CODE = "org_approver_type";
+
 }

kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java

@@ -1,6 +1,7 @@
 package cn.stylefeng.roses.kernel.system.modular.organization.controller;
 
 import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
+import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
@@ -77,4 +78,15 @@ public class HrOrgApproverController {
         return new SuccessResponseData<>(result);
     }
 
+    /**
+     * 获取组织机构审批人类型列表
+     *
+     * @author fengshuonan
+     * @date 2022/9/26 10:44
+     */
+    @GetResource(name = "获取组织机构审批人类型列表", path = "/hrOrgApprover/getApproverTypeList")
+    public ResponseData<List<SimpleDict>> getApproverTypeList() {
+        return new SuccessResponseData<>(hrOrgApproverService.getApproverTypeList());
+    }
+
 }

kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java

@@ -1,5 +1,6 @@
 package cn.stylefeng.roses.kernel.system.modular.organization.service;
 
+import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrgApprover;
 import cn.stylefeng.roses.kernel.system.modular.organization.pojo.request.HrOrgApproverRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -76,4 +77,13 @@ public interface HrOrgApproverService extends IService<HrOrgApprover> {
      */
     List<Long> getDeptOrgApprover(Long deptId, Integer orgApproverType, Integer parentLevel);
 
+    /**
+     * 获取所有审批人类型列表
+     *
+     * @return 审批人类型列表
+     * @author fengshuonan
+     * @date 2022/9/26 10:18
+     */
+    List<SimpleDict> getApproverTypeList();
+
 }

kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java

@@ -1,11 +1,14 @@
 package cn.stylefeng.roses.kernel.system.modular.organization.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
+import cn.stylefeng.roses.kernel.dict.api.DictApi;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
+import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi;
 import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi;
 import cn.stylefeng.roses.kernel.system.api.UserServiceApi;
-import cn.stylefeng.roses.kernel.system.api.enums.OrgApproverTypeEnum;
+import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants;
 import cn.stylefeng.roses.kernel.system.api.pojo.organization.BindUserItem;
 import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO;
 import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO;
@@ -42,6 +45,8 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
     @Resource
     private UserOrgServiceApi userOrgServiceApi;
 
+    @Resource
+    private DictApi dictApi;
 
     @Override
     public void bindUserList(HrOrgApproverRequest hrOrgApproverRequest) {
@@ -115,15 +120,15 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
     public List<HrOrgApprover> getBindingList(HrOrgApproverRequest hrOrgApproverRequest) {
 
         // 获取当前系统一共有哪些组织审批人类型
-        OrgApproverTypeEnum[] values = OrgApproverTypeEnum.values();
+        List<SimpleDict> approverTypeList = this.getApproverTypeList();
 
         // 先初始化空的绑定情况列表
         ArrayList<HrOrgApprover> resultList = new ArrayList<>();
-        for (OrgApproverTypeEnum orgApproverTypeEnum : values) {
+        for (SimpleDict orgApproverType : approverTypeList) {
             HrOrgApprover hrOrgApprover = new HrOrgApprover();
 
             // 设置类型
-            hrOrgApprover.setOrgApproverType(orgApproverTypeEnum.getCode());
+            hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode()));
 
             resultList.add(hrOrgApprover);
         }
@@ -188,6 +193,11 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
         return userList.stream().map(HrOrgApprover::getUserId).collect(Collectors.toList());
     }
 
+    @Override
+    public List<SimpleDict> getApproverTypeList() {
+        return dictApi.getDictDetailsByDictTypeCode(SystemConstants.APPROVER_TYPE_DICT_TYPE_CODE);
+    }
+
     /**
      * 获取信息
      *