From 2b1a74f4faa5a00a294bdc6a6d956c2e009cf467 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 16 Apr 2024 15:32:09 +0800
Subject: [PATCH] 管理员过滤文章

---
 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java |   21 +++++++++++++++++----
 1 files changed, 17 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 d1ffbbd..b40e43e 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
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.cache.SysCache;
+import org.springblade.common.utils.AuthUtils;
 import org.springblade.common.utils.RoleUtil;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -103,10 +104,22 @@
 	 */
 	@Override
 	public IPage<ArticleVO> selectArticlePageByApp(IPage<ArticleVO> page, ArticleVO article) {
-		// 查询用户小区的id
-		String districId = baseMapper.getDistrictId(article.getHouseCode());
-		article.setDistrictId(districId);
-
+		// 判断是否管理员
+		if (AuthUtils.isAdministratorOrAdmin(SpringUtils.getRequestParam("roleName"))) {
+			IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
+			String communityCode = SpringUtils.getRequestParam("communityCode");
+			List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery()
+				.like(DistrictEntity::getCommunityCode, communityCode));
+			if (list.size() > 0) {
+				article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
+			}
+		} else {
+			// 查询用户小区的id
+			String districId = baseMapper.getDistrictId(article.getHouseCode());
+			List<String> objects = new ArrayList<>();
+			objects.add(districId);
+			article.setDistrictIdList(objects);
+		}
 		IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
 		HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
 			.eq(HouseholdEntity::getHouseCode, article.getHouseCode())

--
Gitblit v1.9.3