From 26ac1c8712346522ea1c3fb59be34f4d96544310 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 28 Feb 2024 12:02:42 +0800
Subject: [PATCH] 议事管理-物业服务人员数据未过滤有问题
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
index 3a72e67..369ee7f 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
+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.SpringUtil;
@@ -50,20 +51,20 @@
// List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
// article.setDistrictIdList(collect);
// }
- if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+ if (RoleUtil.isProperty(userRole)) {
// 查询小区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()));
- if (one != null) {
+ PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ if (companyEntity != 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());
+ List<PropertyCompanyDistrictEntity> propertyCompanyDistrictEntityList = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, companyEntity.getId()));
+ if (propertyCompanyDistrictEntityList.size() > 0) {
+ List<String> collect = propertyCompanyDistrictEntityList.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
districtIds.addAll(collect);
}
}
@@ -71,6 +72,7 @@
if (districtIds.size() == 0) {
return page.setRecords(new ArrayList<>());
}
+ article.setPropertyFlag(1);
}
if (userRole.contains("jdgly")) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
@@ -93,6 +95,7 @@
// 查询用户小区的id
String districId = baseMapper.getDistrictId(article.getHouseCode());
article.setDistrictId(districId);
+ article.setUserId(AuthUtil.getUserId());
List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
return page.setRecords(articleVOS);
}
@@ -168,4 +171,12 @@
ArticleVO articleVO = baseMapper.getArticleOne(article);
return articleVO;
}
+
+ @Override
+ public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
+ List<String> objects = new ArrayList<>();
+ objects.add(article.getDistrictId());
+ article.setDistrictIdList(objects);
+ return baseMapper.getArticleByDistrictId(article);
+ }
}
--
Gitblit v1.9.3