From 96935fcb8b94d1d0f8ca6999e1867acf1f1d343f Mon Sep 17 00:00:00 2001 From: 戈灵虎 <50576256@qq.com> Date: Tue, 30 Dec 2025 17:18:14 +0800 Subject: [PATCH] feat(tree): 添加数据权限配置并优化查询条件匹配方式 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java | 6 +++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java 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 ce79b94..b3376b3 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 @@ -25,9 +25,9 @@ public interface TreeMapper extends BaseMapperX { .selectAs(DeptDO::getName, TreeDO::getMaintainunitName) .selectAll(TreeDO.class) .leftJoin(DeptDO.class, DeptDO::getId, TreeDO::getMaintainunit) - .eqIfPresent(TreeDO::getTreenumber, reqVO.getTreenumber()) + .likeIfPresent(TreeDO::getTreenumber, reqVO.getTreenumber()) .likeIfPresent(TreeDO::getLatinname, reqVO.getLatinname()) - .eqIfPresent(TreeDO::getTreetype, reqVO.getTreetype()) + .likeIfPresent(TreeDO::getTreetype, reqVO.getTreetype()) .eqIfPresent(TreeDO::getTreeheight, reqVO.getTreeheight()) .eqIfPresent(TreeDO::getCanopy, reqVO.getCanopy()) .eqIfPresent(TreeDO::getDbh, reqVO.getDbh()) @@ -37,7 +37,7 @@ public interface TreeMapper extends BaseMapperX { .eqIfPresent(TreeDO::getLatitude, reqVO.getLatitude()) .eqIfPresent(TreeDO::getLocation, reqVO.getLocation()) .eqIfPresent(TreeDO::getMaintainunit, reqVO.getMaintainunit()) - .eqIfPresent(TreeDO::getManagedutyunit, reqVO.getManagedutyunit()) + .likeIfPresent(TreeDO::getManagedutyunit, reqVO.getManagedutyunit()) .eqIfPresent(TreeDO::getRoad, reqVO.getRoad()) .eqIfPresent(TreeDO::getStreet, reqVO.getStreet()) .eqIfPresent(TreeDO::getOldtreeownership, reqVO.getOldtreeownership()) 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 new file mode 100644 index 0000000..055a73e --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java @@ -0,0 +1,24 @@ +package com.zteits.urbanops.module.garden.framework.datapermission.config; + +import com.zteits.urbanops.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 一树一档案(Tree)模块的数据权限 Configuration + * + * @author ZIEITS + */ +@Configuration(proxyBeanMethods = false) +public class TreeDataPermissionConfiguration { + + @Bean + public DeptDataPermissionRuleCustomizer treeDeptDataPermissionRuleCustomizer() { + return rule -> { + // 为garden_tree表配置基于部门的数据权限 + rule.addDeptColumn("garden_tree", "dept_id"); + rule.addDeptColumn("garden_oldtrees", "dept_id"); + }; + } + +} \ No newline at end of file -- libgit2 0.21.4