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/partyOrganization/service/impl/PartyOrganizationServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationServiceImpl.java b/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationServiceImpl.java
index 37e03f3..28ffa48 100644
--- a/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/partyOrganization/service/impl/PartyOrganizationServiceImpl.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.partyOrganization.entity.PartyOrganization;
import org.springblade.modules.partyOrganization.mapper.PartyOrganizationMapper;
import org.springblade.modules.partyOrganization.service.IPartyOrganizationService;
@@ -21,8 +23,10 @@
@Override
public IPage<PartyOrganizationVO> getPage(IPage<PartyOrganizationVO> page, PartyOrganizationVO partyOrganizationVO) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
- return page.setRecords(baseMapper.getPage(page,partyOrganizationVO,regionChildCodesList,isAdministrator));
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(PartyOrganizationVO.class, partyOrganizationVO);
+ return page.setRecords(baseMapper.getPage(page,
+ partyOrganizationVO,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator()));
}
}
--
Gitblit v1.9.3