From 7bc12c8ae5f7793dd4b2d512e830b84739a3a089 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 16:22:07 +0800
Subject: [PATCH] 街道身份，只查找该街道下面的业委会

---
 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 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 7bf6e0a..73b9de1 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
@@ -1,12 +1,19 @@
 package org.springblade.modules.article.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.modules.article.entity.Article;
 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.property.entity.PropertyCompanyDistrictEntity;
+import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * @author zhongrj
@@ -16,74 +23,93 @@
 
 public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements ArticleService {
 
+
 	/**
 	 * 查询资讯分页信息
+	 *
 	 * @param page
 	 * @param article 资讯对象
 	 * @return
 	 */
 	@Override
 	public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
-		return page.setRecords(baseMapper.selectArticlePage(page,article));
+		String userRole = AuthUtil.getUserRole();
+		// 物业身份，只查询该物业公司下的公告
+		if (userRole.contains("wygly")) {
+			IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+			PropertyCompanyDistrictEntity one = bean.getOne(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+				.eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()).last("limit 1"));
+			article.setDistrictId(one.getDistrictId());
+		}
+
+		return page.setRecords(baseMapper.selectArticlePage(page, article));
 	}
 
 	/**
 	 * 查询资讯分页信息
+	 *
 	 * @param page
 	 * @param article 资讯对象
 	 * @return
 	 */
 	@Override
 	public IPage<ArticleVO> selectArticlePageByApp(IPage<ArticleVO> page, ArticleVO article) {
-		return page.setRecords(baseMapper.selectArticlePageByApp(page,article));
+		// 查询用户小区的id
+		String districId = baseMapper.getDistrictId(article.getHouseCode());
+		article.setDistrictId(districId);
+		List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
+		return page.setRecords(articleVOS);
 	}
 
 	@Override
 	public IPage<Article> selectArticleG(IPage<Article> page, ArticleVO article) {
-		return page.setRecords(baseMapper.selectArticleG(page,article));
+		return page.setRecords(baseMapper.selectArticleG(page, article));
 	}
 
 	/**
 	 * 查询资讯分页信息(角色权限)
+	 *
 	 * @param page
 	 * @param article 资讯对象
 	 * @return
 	 */
 	@Override
 	public IPage<Article> pageDate(IPage<Article> page, ArticleVO article) {
-		return page.setRecords(baseMapper.pageDate(page,article));
+		return page.setRecords(baseMapper.pageDate(page, article));
 	}
 
 	/**
 	 * 查询资讯分页信息(敏感词预警)
+	 *
 	 * @param page
 	 * @param article 资讯对象
 	 * @return
 	 */
 	@Override
 	public IPage<Article> pageWords(IPage<Article> page, ArticleVO article) {
-		return page.setRecords(baseMapper.pageWords(page,article));
+		return page.setRecords(baseMapper.pageWords(page, article));
 	}
 
 	@Override
 	public IPage<Article> pageCollectList(IPage<Article> page, ArticleVO article) {
-		return page.setRecords(baseMapper.pageCollectList(page,article));
+		return page.setRecords(baseMapper.pageCollectList(page, article));
 	}
 
 	/**
 	 * 查询资讯分页信息(角色权限)附带评论点赞数
+	 *
 	 * @param page
 	 * @param article 资讯对象
 	 * @return
 	 */
 	@Override
 	public IPage<Article> pageLikes(IPage<Article> page, ArticleVO article) {
-		return page.setRecords(baseMapper.pageLikes(page,article));
+		return page.setRecords(baseMapper.pageLikes(page, article));
 	}
 
 	@Override
 	public IPage<Article> pageCollect(IPage<Article> page, ArticleVO article) {
-		return page.setRecords(baseMapper.pageCollect(page,article));
+		return page.setRecords(baseMapper.pageCollect(page, article));
 	}
 
 	/**
@@ -97,7 +123,12 @@
 	}
 
 	@Override
-	public ArticleVO getArticleOne(Article article) {
+	public ArticleVO getArticleOne(ArticleVO article) {
+		if (article.getType() != null && article.getType().equals(4)) {
+			article.setParentId("1740566650527752194");
+		} else {
+			article.setParentId("1722966265111248897");
+		}
 		ArticleVO articleVO = baseMapper.getArticleOne(article);
 		return articleVO;
 	}

--
Gitblit v1.9.3