From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
index a550453..cde90fa 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
@@ -3,9 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.I;
-import org.apache.commons.lang3.StringUtils;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
+import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
@@ -18,8 +17,6 @@
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCompanyDistrictVO;
-import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -51,20 +48,23 @@
public IPage<PropertyCompanyDistrictVO> selectPropertyCompanyDistrictPage(IPage<PropertyCompanyDistrictVO> page, PropertyCompanyDistrictVO propertyCompanyDistrict) {
// 物业 查询用户管理的小区
String userRole = AuthUtil.getUserRole();
- if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+ if (RoleUtil.isProperty(userRole)) {
+ propertyCompanyDistrict.setDeptId(AuthUtil.getDeptId());
// 查询小区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);
+ if (one != null) {
+ 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);
+ }
}
propertyCompanyDistrict.setDistrictIds(districtIds);
if (districtIds.size() == 0) {
@@ -72,8 +72,8 @@
}
}
// 街道
-
- return page.setRecords(baseMapper.selectPropertyCompanyDistrictPage(page, propertyCompanyDistrict));
+ List<PropertyCompanyDistrictVO> propertyCompanyDistrictVOS = baseMapper.selectPropertyCompanyDistrictPage(page, propertyCompanyDistrict);
+ return page.setRecords(propertyCompanyDistrictVOS);
}
/**
--
Gitblit v1.9.3