From 1feb8ae4e9836426ef686847d7c30b7a9dea6437 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 14:35:28 +0800
Subject: [PATCH] 小区查询文章支持多小区

---
 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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..2c516ea 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
@@ -20,6 +20,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 +58,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);
 				// 通过物业公司,查询小区
@@ -174,9 +176,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