BJ_FS / urbanops

Commit 96935fcb8b94d1d0f8ca6999e1867acf1f1d343f

Authored by 戈灵虎
1 parent cae1582a

feat(tree): 添加数据权限配置并优化查询条件匹配方式 

- 将树编号查询条件从精确匹配改为模糊匹配
- 将树类型查询条件从精确匹配改为模糊匹配
- 将管理责任单位查询条件从精确匹配改为模糊匹配
- 新增树模块数据权限配置类
- 为garden_tree表配置基于部门的数据权限
- 为garden_oldtrees表配置基于部门的数据权限
Inline Side-by-side
Showing 2 changed files with 27 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java
  View file @96935fc
@@ -25,9 +25,9 @@ public interface TreeMapper extends BaseMapperX<TreeDO> { @@ -25,9 +25,9 @@ public interface TreeMapper extends BaseMapperX<TreeDO> {
25 .selectAs(DeptDO::getName, TreeDO::getMaintainunitName) 25 .selectAs(DeptDO::getName, TreeDO::getMaintainunitName)
26 .selectAll(TreeDO.class) 26 .selectAll(TreeDO.class)
27 .leftJoin(DeptDO.class, DeptDO::getId, TreeDO::getMaintainunit) 27 .leftJoin(DeptDO.class, DeptDO::getId, TreeDO::getMaintainunit)
28 - .eqIfPresent(TreeDO::getTreenumber, reqVO.getTreenumber()) 28 + .likeIfPresent(TreeDO::getTreenumber, reqVO.getTreenumber())
29 .likeIfPresent(TreeDO::getLatinname, reqVO.getLatinname()) 29 .likeIfPresent(TreeDO::getLatinname, reqVO.getLatinname())
30 - .eqIfPresent(TreeDO::getTreetype, reqVO.getTreetype()) 30 + .likeIfPresent(TreeDO::getTreetype, reqVO.getTreetype())
31 .eqIfPresent(TreeDO::getTreeheight, reqVO.getTreeheight()) 31 .eqIfPresent(TreeDO::getTreeheight, reqVO.getTreeheight())
32 .eqIfPresent(TreeDO::getCanopy, reqVO.getCanopy()) 32 .eqIfPresent(TreeDO::getCanopy, reqVO.getCanopy())
33 .eqIfPresent(TreeDO::getDbh, reqVO.getDbh()) 33 .eqIfPresent(TreeDO::getDbh, reqVO.getDbh())
@@ -37,7 +37,7 @@ public interface TreeMapper extends BaseMapperX<TreeDO> { @@ -37,7 +37,7 @@ public interface TreeMapper extends BaseMapperX<TreeDO> {
37 .eqIfPresent(TreeDO::getLatitude, reqVO.getLatitude()) 37 .eqIfPresent(TreeDO::getLatitude, reqVO.getLatitude())
38 .eqIfPresent(TreeDO::getLocation, reqVO.getLocation()) 38 .eqIfPresent(TreeDO::getLocation, reqVO.getLocation())
39 .eqIfPresent(TreeDO::getMaintainunit, reqVO.getMaintainunit()) 39 .eqIfPresent(TreeDO::getMaintainunit, reqVO.getMaintainunit())
40 - .eqIfPresent(TreeDO::getManagedutyunit, reqVO.getManagedutyunit()) 40 + .likeIfPresent(TreeDO::getManagedutyunit, reqVO.getManagedutyunit())
41 .eqIfPresent(TreeDO::getRoad, reqVO.getRoad()) 41 .eqIfPresent(TreeDO::getRoad, reqVO.getRoad())
42 .eqIfPresent(TreeDO::getStreet, reqVO.getStreet()) 42 .eqIfPresent(TreeDO::getStreet, reqVO.getStreet())
43 .eqIfPresent(TreeDO::getOldtreeownership, reqVO.getOldtreeownership()) 43 .eqIfPresent(TreeDO::getOldtreeownership, reqVO.getOldtreeownership())
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java 0 → 100644
  View file @96935fc
  1 +package com.zteits.urbanops.module.garden.framework.datapermission.config;
  2 +
  3 +import com.zteits.urbanops.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
  4 +import org.springframework.context.annotation.Bean;
  5 +import org.springframework.context.annotation.Configuration;
  6 +
  7 +/**
  8 + * 一树一档案(Tree)模块的数据权限 Configuration
  9 + *
  10 + * @author ZIEITS
  11 + */
  12 +@Configuration(proxyBeanMethods = false)
  13 +public class TreeDataPermissionConfiguration {
  14 +
  15 + @Bean
  16 + public DeptDataPermissionRuleCustomizer treeDeptDataPermissionRuleCustomizer() {
  17 + return rule -> {
  18 + // 为garden_tree表配置基于部门的数据权限
  19 + rule.addDeptColumn("garden_tree", "dept_id");
  20 + rule.addDeptColumn("garden_oldtrees", "dept_id");
  21 + };
  22 + }
  23 +
  24 +}
0 \ No newline at end of file 25 \ No newline at end of file