From 9db5930fa3717f53dccc1f4c7ae044c16fd663c3 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 23 Mar 2024 14:00:39 +0800
Subject: [PATCH] e 呼即办查询修改
---
src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java | 10 +++++++---
src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java | 1 +
src/main/java/org/springblade/modules/task/vo/ECallEventVO.java | 5 +++++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java
index c44b70f..94e2bc1 100644
--- a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java
@@ -42,6 +42,7 @@
List<ECallEventVO> selectECallEventPage(IPage page,
@Param("eCallEvent") ECallEventVO eCallEvent,
@Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList,
@Param("isAdministrator") Integer isAdministrator);
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()));
}
/**
diff --git a/src/main/java/org/springblade/modules/task/vo/ECallEventVO.java b/src/main/java/org/springblade/modules/task/vo/ECallEventVO.java
index ea603dc..623a3ab 100644
--- a/src/main/java/org/springblade/modules/task/vo/ECallEventVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/ECallEventVO.java
@@ -42,4 +42,9 @@
*/
private String communityName;
+ /**
+ * 角色名称
+ */
+ private String roleName;
+
}
--
Gitblit v1.9.3