Merge branch 'master' into dev_fangshan

戈灵虎
2 parents 4e474e36 fb5fc720
Showing 3 changed files with 6 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java
urbanops-module-garden/src/main/resources/mapper/tree/TreeMapper.xml
@@ -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&lt;TreeDO&gt; {
         );
     }
+    @DataPermission(enable = true)
     List<CompanyDeptRoadVO> selectCompanyDeptRoadTreeData(TreeVO tree);
 //    default List<CompanyDeptRoadVO> selectCompanyDeptRoadTreeData(TreeVO tree) {
@@ -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");
         };
@@ -36,10 +36,11 @@
         r.end_remark AS endRemark,
         COALESCE(r.tree_area, 0) AS treeCount,
         COUNT(t.id) AS recordedCount
-        FROM garden_tree t
-        LEFT JOIN garden_road r ON t.road = r.id
+        FROM garden_road r
+        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>