From 4899346493d4e120894015b9e65ee5b6b847b256 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:43 +0800
Subject: [PATCH] 小区id查询用户优化
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 17 +++++++++++------
1 files changed, 11 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 369ee7f..ac90c09 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
@@ -12,6 +12,8 @@
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;
@@ -20,6 +22,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -57,7 +60,8 @@
List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
// 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
+ .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
if (companyEntity != null) {
IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
// 通过物业公司，查询小区
@@ -75,9 +79,11 @@
article.setPropertyFlag(1);
}
if (userRole.contains("jdgly")) {
+ IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- if (regionChildCodesList.size() > 0) {
- article.setDistrictIdList(regionChildCodesList);
+ List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getCommunityCode, regionChildCodesList));
+ if (list.size() > 0) {
+ article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
}
}
return page.setRecords(baseMapper.selectArticlePage(page, article));
@@ -174,9 +180,8 @@
@Override
public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
- List<String> objects = new ArrayList<>();
- objects.add(article.getDistrictId());
- article.setDistrictIdList(objects);
+ List<String> stringList = Arrays.asList(article.getDistrictId().split(","));
+ article.setDistrictIdList(stringList);
return baseMapper.getArticleByDistrictId(article);
}
}
--
Gitblit v1.9.3