From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 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 f1127ca..1a6b910 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
@@ -6,16 +6,19 @@
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.mapper.ArticleMapper;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVO;
-import org.springblade.modules.district.entity.DistrictEntity;
-import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
+import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
+import org.springblade.modules.property.service.IPropertyCompanyService;
+import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,20 +42,42 @@
public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
String userRole = AuthUtil.getUserRole();
// 物业身份，只查询该物业公司下的公告
- if (userRole.contains("wygly")) {
- IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
- List<PropertyCompanyDistrictEntity> list = bean.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
- .eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()));
- List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
- article.setDistrictIdList(collect);
+ // if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+ // // 物业公司 有哪些小区
+ // IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+ // List<PropertyCompanyDistrictEntity> list = bean.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ // .eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()));
+ // List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
+ // article.setDistrictIdList(collect);
+ // }
+ 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()));
+ 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);
+ }
+ }
+ article.setDistrictIdList(districtIds);
+ if (districtIds.size() == 0) {
+ return page.setRecords(new ArrayList<>());
+ }
+ article.setPropertyFlag(1);
}
if (userRole.contains("jdgly")) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
- List<DistrictEntity> list = bean.list(Wrappers.<DistrictEntity>lambdaQuery()
- .in(DistrictEntity::getCommunityCode, regionChildCodesList));
- List<String> fieldValues = list.stream().map(DistrictEntity::getId).collect(Collectors.toList());
- article.setDistrictIdList(fieldValues);
+ if (regionChildCodesList.size() > 0) {
+ article.setDistrictIdList(regionChildCodesList);
+ }
}
return page.setRecords(baseMapper.selectArticlePage(page, article));
}
--
Gitblit v1.9.3