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/mapper/ArticleMapper.xml | 9 ++++-----
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 12 ++++++------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index 64417a0..a1e9ed4 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -199,7 +199,6 @@
where 1=1
and ja.is_deleted = 0
<if test="article.propertyFlag!=null ">
- and ja.district_id IS NOT NULL
<if test="article.communityName!=null and article.communityName!=''">
and br.`village_name` like concat('%',#{article.communityName},'%')
</if>
@@ -239,10 +238,10 @@
<foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
</foreach>
)
- and ja.district_id in
- <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+<!-- and ja.district_id in-->
+<!-- <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">-->
+<!-- #{item}-->
+<!-- </foreach>-->
</if>
order by ja.create_time desc
</select>
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 8ad395c..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);
}
}
--
Gitblit v1.9.3