From 4ffbdb32186834f49f7a47b242381be4e7d894ed Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Feb 2024 17:39:28 +0800
Subject: [PATCH] 投票人员查询优化
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..b3ceaa5 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
@@ -56,14 +56,14 @@
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 +71,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 +94,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);
}
--
Gitblit v1.9.3