From df4794b07aacc82b5c038c930b66209d8ad0e79d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 10 Apr 2024 11:55:28 +0800
Subject: [PATCH] 数据修改,删除同步修改,没有索引时不操作,es 数据初始化,删除角色控制

---
 src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
index 40b9930..2db5463 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java
@@ -19,6 +19,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.logging.log4j.util.Strings;
 import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.service.IDeptService;
@@ -43,9 +44,12 @@
 
 	@Override
 	public IPage<ECallEventVO> selectECallEventPage(IPage<ECallEventVO> page, ECallEventVO eCallEvent) {
-		List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
-		Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
-		return page.setRecords(baseMapper.selectECallEventPage(page, eCallEvent,regionChildCodesList,isAdministrator));
+		CommonParamSet invoke = new CommonParamSet<>().invoke(ECallEventVO.class, eCallEvent);
+		return page.setRecords(baseMapper.selectECallEventPage(page,
+			eCallEvent,
+			invoke.getRegionChildCodesList(),
+			invoke.getGridCodeList(),
+			invoke.getIsAdministrator()));
 	}
 
 	/**

--
Gitblit v1.9.3