From fb5fc72063662d361414a0b148ec05b1e6952e43 Mon Sep 17 00:00:00 2001
From: 戈灵虎 <50576256@qq.com>
Date: Fri, 3 Apr 2026 17:04:25 +0800
Subject: [PATCH] feat(garden): 为道路数据添加部门权限控制

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java                                       | 2 ++
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java | 1 +
 urbanops-module-garden/src/main/resources/mapper/tree/TreeMapper.xml                                                                        | 1 +
 3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java
index cf5a5d8..5dd0870 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.dal.mysql.tree;
 import java.util.*;
 
 import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
 import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
@@ -73,6 +74,7 @@ public interface TreeMapper extends BaseMapperX<TreeDO> {
         );
     }
 
+    @DataPermission(enable = true)
     List<CompanyDeptRoadVO> selectCompanyDeptRoadTreeData(TreeVO tree);
 
 //    default List<CompanyDeptRoadVO> selectCompanyDeptRoadTreeData(TreeVO tree) {
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java
index 6473846..135f7a3 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java
@@ -17,6 +17,7 @@ public class TreeDataPermissionConfiguration {
         return rule -> {
             // 为garden_tree表配置基于部门的数据权限
             rule.addDeptColumn("garden_tree", "dept_id");
+            rule.addDeptColumn("garden_road", "dept_id");
             rule.addDeptColumn("garden_oldtrees", "dept_id");
             rule.addDeptColumn("garden_emergency_task", "dept_id");
         };
diff --git a/urbanops-module-garden/src/main/resources/mapper/tree/TreeMapper.xml b/urbanops-module-garden/src/main/resources/mapper/tree/TreeMapper.xml
index 7932d24..376edc9 100644
--- a/urbanops-module-garden/src/main/resources/mapper/tree/TreeMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/tree/TreeMapper.xml
@@ -40,6 +40,7 @@
         LEFT JOIN garden_tree t ON t.road = r.id
         LEFT JOIN system_dept d ON r.dept_id = d.id AND d.status = 0
         WHERE r.company_id = #{belongCompanyId}
+        and d.id is not null
         <if test="roadName != null and roadName != ''">
             AND r.road_name LIKE CONCAT('%', #{roadName}, '%')
         </if>
--
libgit2 0.21.4