From 2dad58eb94e729b2efd51ebac7fcc773aca80ded Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 03 Apr 2024 14:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java b/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
index 602241d..232c69a 100644
--- a/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
+++ b/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.excel.CommunityExcel;
@@ -44,9 +45,11 @@
@Override
public IPage<CommunityVO> selectCommunityPage(IPage<CommunityVO> page, CommunityVO community) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
- return page.setRecords(baseMapper.selectCommunityPage(page, community,regionChildCodesList,isAdministrator));
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(CommunityVO.class, community);
+ return page.setRecords(baseMapper.selectCommunityPage(page,
+ community,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator()));
}
/**
--
Gitblit v1.9.3