From 1b5800c788e8c9277a23f76666abc1b757d56b42 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Fri, 14 Jun 2024 15:53:25 +0800
Subject: [PATCH] 线上 es 全文检索升级到8.14.1 版本导致数据更新异常调整(不抛出异常),实际数据已经被操作

---
 src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
index 3c3e1ef..f9bc88c 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -23,6 +23,7 @@
 import org.apache.logging.log4j.util.Strings;
 import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
 import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.SpringUtil;
@@ -65,9 +66,8 @@
 
 	@Override
 	public IPage<GridmanVO> selectGridmanPage(IPage<GridmanVO> page, GridmanVO gridman) {
-		List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
-		Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
-		return page.setRecords(baseMapper.selectGridmanPage(page, gridman, regionChildCodesList, isAdministrator));
+		CommonParamSet commonParamSet = new CommonParamSet<>().invoke(GridmanVO.class, gridman);
+		return page.setRecords(baseMapper.selectGridmanPage(page, gridman, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator()));
 	}
 
 	/**

--
Gitblit v1.9.3