From 9c60ca4dbaa0d5eda53c68d15ac361f1d3b27837 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 18 Jan 2024 18:20:21 +0800
Subject: [PATCH] 数据过滤补充
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
index 09eabae..dc03796 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -22,6 +22,7 @@
import org.flowable.engine.RepositoryService;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.log.exception.ServiceException;
@@ -71,10 +72,8 @@
@Override
public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null != dept) {
- propertyCapitalApply.setRegionCode(dept.getRegionCode());
- }
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
if (userRole.contains("wygly")) {
@@ -86,7 +85,7 @@
return page.setRecords(new ArrayList<PropertyCapitalApplyVO>());
}
}
- return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
+ return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply,regionChildCodesList,isAdministrator));
}
@Autowired
--
Gitblit v1.9.3