From 494aeb58eb885b40ab2fdb083aaa79007bb79ae2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 17:46:23 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 149c022..c983d2f 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,14 +1,21 @@
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.cache.SysCache;
+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;
+import java.util.stream.Collectors;
/**
* @author zhongrj
@@ -28,6 +35,23 @@
*/
@Override
public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
+ String userRole = AuthUtil.getUserRole();
+ // 物业身份，只查询该物业公司下的公告
+ if (userRole.contains("wygly")) {
+ IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+ List<PropertyCompanyDistrictEntity> list = bean.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()));
+ List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
+ article.setDistrictIdList(collect);
+ }
+ if (userRole.contains("jdgly")) {
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+// IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
+// List<DistrictEntity> list = bean.list(Wrappers.<DistrictEntity>lambdaQuery()
+// .in(DistrictEntity::getCommunityCode, regionChildCodesList));
+// List<String> fieldValues = list.stream().map(DistrictEntity::getId).collect(Collectors.toList());
+ article.setDistrictIdList(regionChildCodesList);
+ }
return page.setRecords(baseMapper.selectArticlePage(page, article));
}
--
Gitblit v1.9.3