通过用户ID/组织id获取用户组织

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysDeptController.java

@@ -159,4 +159,22 @@ public class SysDeptController extends BaseController {
     public AjaxResult deptRole(@PathVariable Long deptId, @RequestBody List<String> roleKeyList) {
         return success(deptService.deptRole(deptId, roleKeyList));
     }
+
+    /**
+     * 通过用户ID获取用户组织信息
+     * GET /system/dept/userOrgInfo?userId=xxx
+     */
+    @GetMapping("/userOrgInfo")
+    public AjaxResult getUserOrgInfo(@RequestParam Long userId) {
+        return success(deptService.resolveOrgInfoByUserId(userId));
+    }
+
+    /**
+     * 通过部门ID获取部门组织信息及上级链
+     * GET /system/dept/deptOrgInfo?deptId=xxx
+     */
+    @GetMapping("/deptOrgInfo")
+    public AjaxResult getDeptOrgInfo(@RequestParam Long deptId) {
+        return success(deptService.getDeptInfoByDeptId(deptId));
+    }
 }

airport-common/src/main/java/com/sundot/airport/common/dto/DeptInfo.java

@@ -16,32 +16,32 @@ public class DeptInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 班组 id
+     * 小组 id
      */
     private Long teamId;
 
     /**
-     * 班组名称
+     * 小组名称
      */
     private String teamName;
 
     /**
-     * 部门 id
+     * 班组 id
      */
     private Long departmentId;
 
     /**
-     * 部门名称
+     * 班组名称
      */
     private String departmentName;
 
     /**
-     * 大队 id
+     * 部门 id
      */
     private Long brigadeId;
 
     /**
-     * 大队名称
+     * 部门名称
      */
     private String brigadeName;
 

airport-common/src/main/java/com/sundot/airport/common/dto/UserOrgInfo.java

@@ -0,0 +1,18 @@
+package com.sundot.airport.common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户组织信息
+ */
+@Data
+public class UserOrgInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long userId;
+    private DeptInfo deptInfo;
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/DeptType.java

@@ -13,10 +13,10 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum DeptType {
     STATION("STATION", "机构站"),
-    BRIGADE("BRIGADE", "大队"),
-    MANAGER("MANAGER", "主管"),
+    BRIGADE("BRIGADE", "部门"),
+    MANAGER("MANAGER", "班组"),
     DEPARTMENT("DEPARTMENT", "科室"),
-    TEAMS("TEAMS", "班组"),
+    TEAMS("TEAMS", "小组"),
     ;
 
     private final String code;

airport-system/src/main/java/com/sundot/airport/system/service/ISysDeptService.java

@@ -7,6 +7,7 @@ import com.sundot.airport.common.core.domain.DeptUserTreeSelect;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.dto.DeptInfo;
+import com.sundot.airport.common.dto.UserOrgInfo;
 
 /**
  * 部门管理 服务层
@@ -196,4 +197,12 @@ public interface ISysDeptService {
      * @return 部门列表
      */
     public List<SysDept> selectChildrenDeptById(Long deptId);
+
+    /**
+     * 通过用户ID获取用户组织信息
+     *
+     * @param userId 用户ID
+     * @return 用户组织信息
+     */
+    public UserOrgInfo resolveOrgInfoByUserId(Long userId);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysDeptServiceImpl.java

@@ -12,6 +12,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.config.LevelConfig;
 import com.sundot.airport.common.dto.DeptInfo;
+import com.sundot.airport.common.dto.UserOrgInfo;
 import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.enums.DeptTypeEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
@@ -609,4 +610,21 @@ public class SysDeptServiceImpl implements ISysDeptService {
     public List<SysDept> selectChildrenDeptById(Long deptId) {
         return deptMapper.selectUseChildrenDeptById(deptId);
     }
+
+    @Override
+    public UserOrgInfo resolveOrgInfoByUserId(Long userId) {
+        UserOrgInfo result = new UserOrgInfo();
+        if (userId == null) {
+            return result;
+        }
+        result.setUserId(userId);
+
+        SysUser user = userMapper.selectUserById(userId);
+        if (user == null || user.getDeptId() == null) {
+            return result;
+        }
+
+        result.setDeptInfo(getDeptInfoByDeptId(user.getDeptId()));
+        return result;
+    }
 }