From 5745a87f3a139ea2bbdaf4704978e4c151ecc45a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jan 2024 17:39:48 +0800
Subject: [PATCH] 物业管理管和项目经理数据过滤
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 9ae7509..a51a631 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
@@ -33,6 +33,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.flow.business.service.IFlowService;
import org.springblade.flow.core.constant.ProcessConstant;
import org.springblade.flow.core.entity.BladeFlow;
@@ -43,8 +44,12 @@
import org.springblade.modules.ownersCommittee.entity.OwnersCommitteeEntity;
import org.springblade.modules.ownersCommittee.service.IOwnersCommitteeService;
import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
+import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
+import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.mapper.PropertyCapitalApplyMapper;
import org.springblade.modules.property.service.IPropertyCapitalApplyService;
+import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
+import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
import org.springblade.modules.system.entity.Dept;
@@ -59,6 +64,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 物业维修资金申请表 服务实现类
@@ -79,14 +85,23 @@
Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
// 判断角色，物业角色只能查询当前小区的
String userRole = AuthUtil.getUserRole();
- if (userRole.contains("wygly")) {
- IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
- List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
- if (strings.size() > 0) {
- propertyCapitalApply.setDistrictIdList(strings);
- } else {
- return page.setRecords(new ArrayList<PropertyCapitalApplyVO>());
+ if (userRole.contains("wygly")|| userRole.contains("wyxmjl")) {
+ // 查询小区id
+ IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
+ List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
+ // 通过用户机构查询用户的物业公司
+ // 通过用户机构查询用户的物业公司
+ IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
+ PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+ // 通过物业公司，查询小区
+ List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
+ if (list.size() > 0) {
+ List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
+ districtIds.addAll(collect);
}
+ propertyCapitalApply.setDistrictIdList(districtIds);
}
return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply, regionChildCodesList, isAdministrator));
}
--
Gitblit v1.9.3