From bb761095f9d9516c97eb28e8d31c1c458f6015f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
 <10549902+zhuangruibo@user.noreply.gitee.com>
Date: Wed, 1 Apr 2026 22:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysUserController.java  |  11 +-
 .../org/dromara/system/domain/SysDept.java    | 304 +++++++++++++++++-
 .../dromara/system/mapper/SysDeptMapper.java  |  17 +
 .../system/service/ISysDeptService.java       |   9 +
 .../service/impl/SysDeptServiceImpl.java      |  14 +
 ...���.sql => 005-�新生���.sql} |   0
 6 files changed, 351 insertions(+), 4 deletions(-)
 rename script/sql/zfjd-refactoring-v1/{0005-�新生���.sql => 005-�新生���.sql} (100%)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
index 4add1bd..7958734 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -293,7 +293,16 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:list")
     @GetMapping("/deptTree")
     public R<List<Tree<String>>> deptTree(SysDeptBo dept) {
-        return R.ok(deptService.selectDeptTreeList(dept));
+        List<Integer> zones =new ArrayList<>();
+        zones.add(1);
+        zones.add(2);
+        zones.add(3);
+        zones.add(4);
+        zones.add(5);
+        zones.add(6);
+        zones.add(16);
+        zones.add(15);
+        return R.ok(deptService.selectDeptTreeList(dept,zones));
     }
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
index f786042..82639e9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
@@ -35,53 +35,351 @@ public class SysDept extends TenantEntity {
     /**
      * 父部门ID
      */
+    @TableField("parent_id")
     private String parentId;
 
+    /**
+     * 祖级列表
+     */
+    @TableField("ancestors")
+    private String ancestors;
+
     /**
      * 部门�称
      */
+    @TableField("dept_name")
     private String deptName;
 
     /**
      * 部门类别编�
      */
+    @TableField("dept_category")
     private String deptCategory;
 
     /**
      * 显示顺�
      */
+    @TableField("order_num")
     private Integer orderNum;
 
     /**
      * 负责人
      */
+    @TableField("leader")
     private Long leader;
 
     /**
      * �系电�
      */
+    @TableField("phone")
     private String phone;
 
     /**
      * 邮箱
      */
+    @TableField("email")
     private String email;
 
     /**
-     * 部门状�:0正常,1�用
+     * 部门状�（0正常 1�用）
      */
+    @TableField("status")
     private String status;
 
     /**
      * 删除标志（0代表存在 1代表删除）
      */
+    @TableField(value = "del_flag")
     @TableLogic
     private String delFlag;
 
     /**
-     * 祖级列表
+     * 部门类型（0:机构,1:部门,2:�组）
      */
-    private String ancestors;
+    @TableField("dept_type")
+    private String deptType;
+
+    /**
+     * 金�原始组织结构id
+     */
+    @TableField("kingdee_org_id")
+    private String kingdeeOrgId;
+
+    /**
+     * 金�原始父组织id
+     */
+    @TableField("kingdee_org_parent_id")
+    private String kingdeeOrgParentId;
+
+    /**
+     * 所属租户
+     */
+    @TableField("tenant_code")
+    private String tenantCode;
+
+    /**
+     * 用户ID
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 组织层级
+     */
+    @TableField("zzLevel")
+    private Integer zzLevel;
+
+    /**
+     * ç¼–ç �
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 映射��父ID
+     */
+    @TableField("mappingUnitParentId")
+    private String mappingUnitParentId;
+
+    /**
+     * 更新时间
+     */
+    @TableField("updateAt")
+    private String updateAt;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createAt")
+    private String createAt;
+
+    /**
+     * �述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 作用点
+     */
+    @TableField("effectOn")
+    private String effectOn;
+
+    /**
+     * 父ID（�步用）
+     */
+    @TableField("parentId")
+    private String syncParentId;
+
+    /**
+     * 组织ID
+     */
+    @TableField("organizationId")
+    private String organizationId;
+
+    /**
+     * 排��
+     */
+    @TableField("sequence")
+    private String sequence;
+
+    /**
+     * 是�删除
+     */
+    @TableField("isDeleted")
+    private String isDeleted;
+
+    /**
+     * 组织显示路径
+     */
+    @TableField("zzDisplayPath")
+    private String zzDisplayPath;
+
+    /**
+     * �称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * GUID
+     */
+    @TableField("guid")
+    private String guid;
+
+    /**
+     * 是���节点
+     */
+    @TableField("zzIsLeaf")
+    private String zzIsLeaf;
+
+    /**
+     * 是��用
+     */
+    @TableField("isDisabled")
+    private String isDisabled;
+
+    /**
+     * 全称
+     */
+    @TableField("fullname")
+    private String fullname;
+
+    /**
+     * 是�映射��
+     */
+    @TableField("isMappingUnit")
+    private String isMappingUnit;
+
+    /**
+     * 市认���ID
+     */
+    @TableField("srzUnitId")
+    private String srzUnitId;
+
+    /**
+     * 任务ID
+     */
+    @TableField("taskId")
+    private String taskId;
+
+    /**
+     * 组织父ID
+     */
+    @TableField("organizationParentId")
+    private String organizationParentId;
+
+    /**
+     * 系统ID
+     */
+    @TableField("systemId")
+    private String systemId;
+
+    /**
+     * 信用代�
+     */
+    @TableField("creditcode")
+    private String creditcode;
+
+    /**
+     * 区域标识
+     */
+    @TableField("zone")
+    private Integer zone;
+
+    /**
+     * 机构简称
+     */
+    @TableField("simpleName")
+    private String simpleName;
+
+    /**
+     * 是�法定机构
+     */
+    @TableField("isStatutoryOrg")
+    private String isStatutoryOrg;
+
+    /**
+     * 是�生效
+     */
+    @TableField("isActive")
+    private String isActive;
+
+    /**
+     * 机构状�代�
+     */
+    @TableField("unitStatusCode")
+    private String unitStatusCode;
+
+    /**
+     * 机构状�
+     */
+    @TableField("unitStatus")
+    private String unitStatus;
+
+    /**
+     * 机构类型
+     */
+    @TableField("unitType")
+    private String unitType;
+
+    /**
+     * 行政区划代�
+     */
+    @TableField("xzqhCode")
+    private String xzqhCode;
+
+    /**
+     * 行政区划
+     */
+    @TableField("xzqh")
+    private String xzqh;
+
+    /**
+     * 是��公管�
+     */
+    @TableField("isCGManager")
+    private String isCGManager;
+
+    /**
+     * 是�局（委）办
+     */
+    @TableField("isBureauOffice")
+    private String isBureauOffice;
+
+    /**
+     * 机构类型代�
+     */
+    @TableField("unitTypeCode")
+    private String unitTypeCode;
+
+    /**
+     * ��性质代�
+     */
+    @TableField("dwxzCode")
+    private String dwxzCode;
+
+    /**
+     * ��性质
+     */
+    @TableField("dwxz")
+    private String dwxz;
+
+    /**
+     * 系统��类型编�
+     */
+    @TableField("unitSysTypeCode")
+    private String unitSysTypeCode;
+
+    /**
+     * 系统��类型
+     */
+    @TableField("unitSysType")
+    private String unitSysType;
+
+    /**
+     * ��系统类别�述
+     */
+    @TableField("dwxtlbms")
+    private String dwxtlbms;
+
+    /**
+     * 机构规格代�
+     */
+    @TableField("unitLevelCode")
+    private String unitLevelCode;
+
+    /**
+     * 机构规格
+     */
+    @TableField("unitLevel")
+    private String unitLevel;
+
+    /**
+     * 所属区节点
+     */
+    @TableField("area_node")
+    private String areaNode;
 
     /**
      * �部门
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
index 9f957f1..69e7b1d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
@@ -69,6 +69,23 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
         return this.selectVoList(queryWrapper);
     }
 
+    /**
+     * 查询部门管�数�（按zone过滤）
+     *
+     * @param queryWrapper 查询�件
+     * @param zones        区域标识列表
+     * @return 部门信�集�
+     */
+    @DataPermission({
+        @DataColumn(key = "deptName", value = "dept_id")
+    })
+    default List<SysDeptVo> selectDeptList(Wrapper<SysDept> queryWrapper, List<Integer> zones) {
+        if (zones != null && !zones.isEmpty()) {
+            ((LambdaQueryWrapper<SysDept>) queryWrapper).in(SysDept::getZone, zones);
+        }
+        return this.selectVoList(queryWrapper);
+    }
+
     /**
      * 分页查询部门管�数�
      *
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java
index 6a70901..01d035b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java
@@ -40,6 +40,15 @@ public interface ISysDeptService {
      */
     List<Tree<String>> selectDeptTreeList(SysDeptBo dept);
 
+    /**
+     * 查询部门树结构信�（按zone过滤）
+     *
+     * @param dept  部门信�
+     * @param zones 区域标识列表
+     * @return 部门树信�集�
+     */
+    List<Tree<String>> selectDeptTreeList(SysDeptBo dept, List<Integer> zones);
+
     /**
      * 构建�端所需�下拉树结构
      *
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
index e1410d9..01366bf 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
@@ -91,6 +91,20 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         return buildDeptTreeSelect(depts);
     }
 
+    /**
+     * 查询部门树结构信�（按zone过滤）
+     *
+     * @param bo    部门信�
+     * @param zones 区域标识列表
+     * @return 部门树信�集�
+     */
+    @Override
+    public List<Tree<String>> selectDeptTreeList(SysDeptBo bo, List<Integer> zones) {
+        LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
+        List<SysDeptVo> depts = baseMapper.selectDeptList(lqw, zones);
+        return buildDeptTreeSelect(depts);
+    }
+
     private LambdaQueryWrapper<SysDept> buildQueryWrapper(SysDeptBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SysDept> lqw = Wrappers.lambdaQuery();
diff --git a/script/sql/zfjd-refactoring-v1/0005-�新生���.sql b/script/sql/zfjd-refactoring-v1/005-�新生���.sql
similarity index 100%
rename from script/sql/zfjd-refactoring-v1/0005-�新生���.sql
rename to script/sql/zfjd-refactoring-v1/005-�新生���.sql