From 5745a87f3a139ea2bbdaf4704978e4c151ecc45a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jan 2024 17:39:48 +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 73b9de1..74c6f03 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
@@ -3,6 +3,7 @@
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;
@@ -14,6 +15,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhongrj
@@ -36,12 +38,23 @@
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());
+ 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());
+ if (regionChildCodesList.size() > 0) {
+ article.setDistrictIdList(regionChildCodesList);
+ }
+ }
return page.setRecords(baseMapper.selectArticlePage(page, article));
}
--
Gitblit v1.9.3