【v3.8.3】用户组织机构大改造（新增主岗位、主岗位、用户签名）

2026-02-04 01:25:34 +08:00 · 2025-09-14 11:53:36 +08:00
parent aefdcd6315
commit d7dc81455d
51 changed files with 2869 additions and 661 deletions
--- a/jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@ -2,6 +2,7 @@ package org.jeecg.common.system.api;

 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.api.CommonAPI;
+import org.jeecg.common.api.dto.AiragFlowDTO;
 import org.jeecg.common.api.dto.DataLogDTO;
 import org.jeecg.common.api.dto.OnlineAuthDTO;
 import org.jeecg.common.api.dto.message.*;
@ -13,6 +14,7 @@ import org.jeecg.common.system.api.factory.SysBaseAPIFallbackFactory;
 import org.jeecg.common.system.vo.*;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;

@ -681,7 +683,7 @@ public interface ISysBaseAPI extends CommonAPI {
     * @return
     */
    @GetMapping("/sys/api/getRoleCode")
-    String getRoleCodeById(String id);
+    String getRoleCodeById(@RequestParam(name = "id") String id);

    /**
     * 根据roleCode查询角色信息，可逗号分隔多个
@ -709,7 +711,7 @@ public interface ISysBaseAPI extends CommonAPI {
     * @return JSONObject
     */
    @GetMapping("/sys/api/queryUserById")
-    JSONObject queryUserById(String id);
+    JSONObject queryUserById(@RequestParam(name="id") String id);


    /**
@ -770,7 +772,7 @@ public interface ISysBaseAPI extends CommonAPI {
     * @return
     */
    @GetMapping("/sys/api/queryUserIdsByPositionIds")
-    List<String> queryUserIdsByPositionIds(List<String> positionIds);
+    List<String> queryUserIdsByPositionIds(@RequestParam("positionIds") List<String> positionIds);

    /**
     * 根据部门和子部门下的所有用户账号
@ -815,4 +817,56 @@ public interface ISysBaseAPI extends CommonAPI {
            @RequestParam(value = "currentUserName") String currentUserName
    );

+    /**
+     * 根据部门编码查询公司信息
+     * @param orgCode 部门编码
+     * @return
+     * @author chenrui
+     * @date 2025/8/12 14:45
+     */
+    @GetMapping(value = "/sys/api/queryCompByOrgCode")
+    SysDepartModel queryCompByOrgCode(@RequestParam(name = "sysCode") String orgCode);
+
+    /**
+     * 根据部门编码和层次查询上级公司
+     *
+     * @param orgCode 部门编码
+     * @param level 可以传空 默认为1级 最小值为1
+     * @return
+     */
+    @GetMapping(value = "/sys/api/queryCompByOrgCodeAndLevel")
+    SysDepartModel queryCompByOrgCodeAndLevel(@RequestParam("orgCode") String orgCode, @RequestParam("level") Integer level);
+
+    /**
+     * 16 运行AIRag流程
+     * for  [QQYUN-13634]在baseapi里面封装方法，方便其他模块调用
+     *
+     * @param airagFlowDTO
+     * @return 流程执行结果,可能是String或者Map
+     * @author chenrui
+     * @date 2025/9/2 11:43
+     */
+    @PostMapping(value = "/sys/api/runAiragFlow")
+    Object runAiragFlow(@RequestBody AiragFlowDTO airagFlowDTO);
+
+    /**
+     * 根据部门code或部门id获取部门名称(当前和上级部门)
+     *
+     * @param orgCode 部门编码
+     * @param depId   部门id
+     * @return String 部门名称
+     */
+    @GetMapping("/getDepartPathNameByOrgCode")
+    String getDepartPathNameByOrgCode(@RequestParam(name = "orgCode", required = false) String orgCode, @RequestParam(name = "depId", required = false) String depId);
+
+
+    /**
+     * 根据部门ID查询部门及其子部门下用户ID <br/>
+     * @param deptIds
+     * @return
+     * @author chenrui
+     * @date 2025/09/08 15:28
+     */
+    @GetMapping("/sys/api/queryUserIdsByCascadeDeptIds")
+    List<String> queryUserIdsByCascadeDeptIds(@RequestParam("deptIds") List<String> deptIds);
 }
--- a/jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
@ -3,6 +3,7 @@ package org.jeecg.common.system.api.fallback;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.dto.AiragFlowDTO;
 import org.jeecg.common.api.dto.DataLogDTO;
 import org.jeecg.common.api.dto.OnlineAuthDTO;
 import org.jeecg.common.api.dto.message.*;
@ -475,4 +476,28 @@ public class SysBaseAPIFallback implements ISysBaseAPI {

    }

+    @Override
+    public SysDepartModel queryCompByOrgCode(String orgCode) {
+        return null;
+    }
+
+    @Override
+    public SysDepartModel queryCompByOrgCodeAndLevel(String orgCode, Integer level) {
+        return null;
+    }
+
+    @Override
+    public Object runAiragFlow(AiragFlowDTO airagFlowDTO) {
+        return null;
+    }
+
+    @Override
+    public String getDepartPathNameByOrgCode(String orgCode, String depId) {
+        return "";
+    }
+
+    @Override
+    public List<String> queryUserIdsByCascadeDeptIds(List<String> deptIds) {
+        return null;
+    }
 }
--- a/jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@ -2,12 +2,14 @@ package org.jeecg.common.system.api;

 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.api.CommonAPI;
+import org.jeecg.common.api.dto.AiragFlowDTO;
 import org.jeecg.common.api.dto.DataLogDTO;
 import org.jeecg.common.api.dto.OnlineAuthDTO;
 import org.jeecg.common.api.dto.message.*;
 import org.jeecg.common.constant.enums.DySmsEnum;
 import org.jeecg.common.constant.enums.EmailTemplateEnum;
 import org.jeecg.common.system.vo.*;
+import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;
 import java.util.Map;
@ -504,6 +506,14 @@ public interface ISysBaseAPI extends CommonAPI {
     * @return
     */
    List<String> queryUserIdsByDeptIds(List<String> deptIds);
+
+
+    /**
+     * 根据部门ID查询部门及其子部门下用户ID <br/>
+     * @param deptIds
+     * @return
+     */
+    List<String> queryUserIdsByCascadeDeptIds(List<String> deptIds);
    
    /**
     * 根据部门ID查询用户账号
@ -557,4 +567,42 @@ public interface ISysBaseAPI extends CommonAPI {
     * @param currentUserName
     */
    void announcementAutoRelease(String dataId, String currentUserName);
+
+    /**
+     * 根据部门编码查询公司信息
+     * @param orgCode 部门编码
+     * @return
+     * @author chenrui
+     * @date 2025/8/12 14:53
+     */
+    SysDepartModel queryCompByOrgCode(@RequestParam(name = "sysCode") String orgCode);
+
+    /**
+     * 根据部门编码和层次查询上级公司
+     * 
+     * @param orgCode 部门编码
+     * @param level 可以传空 默认为1级 最小值为1
+     * @return
+     */
+    SysDepartModel queryCompByOrgCodeAndLevel(String orgCode, Integer level);
+
+    /**
+     * 16 运行AIRag流程
+     * for [QQYUN-13634]在baseapi里面封装方法，方便其他模块调用
+     *
+     * @param airagFlowDTO
+     * @return 流程执行结果,可能是String或者Map
+     * @author chenrui
+     * @date 2025/9/2 11:43
+     */
+    Object runAiragFlow(AiragFlowDTO airagFlowDTO);
+
+    /**
+     * 根据部门code或部门id获取部门名称(当前和上级部门)
+     *
+     * @param orgCode 部门编码
+     * @param depId   部门id
+     * @return String 部门名称
+     */
+    String getDepartPathNameByOrgCode(String orgCode, String depId);
 }