From 5e014678ad6e5cf2be0bf40b08295518c67dcff8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 09:27:23 +0800
Subject: [PATCH] e呼即办街道社区数据过滤
---
src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java | 11 +++++++++++
src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml | 2 +-
src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml | 3 +++
src/main/java/org/springblade/modules/task/vo/ECallEventVO.java | 5 +++++
4 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index 9180812..1b9701e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -113,7 +113,7 @@
and parent_code = #{parentCode}
</if>
<if test="regionCode!=null and regionCode!=''">
- and parent_code = #{regionCode}
+ and code like concat('%',#{regionCode},'%')
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
index f43bfb5..f1e5c91 100644
--- a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
@@ -40,6 +40,9 @@
<if test="eCallEvent.realName!=null and eCallEvent.realName!=''">
and real_name like concat('%',#{eCallEvent.realName},'%')
</if>
+ <if test="eCallEvent.regionCode!=null and eCallEvent.regionCode!=''">
+ and community_code like concat('%',#{eCallEvent.regionCode},'%')
+ </if>
</select>
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 382e78e..a126dcc 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
@@ -17,10 +17,14 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.ECallEventEntity;
import org.springblade.modules.task.vo.ECallEventVO;
import org.springblade.modules.task.mapper.EcCallEventMapper;
import org.springblade.modules.task.service.IECallEventService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,8 +37,15 @@
@Service
public class ECallEventServiceImpl extends ServiceImpl<EcCallEventMapper, ECallEventEntity> implements IECallEventService {
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<ECallEventVO> selectECallEventPage(IPage<ECallEventVO> page, ECallEventVO eCallEvent) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ eCallEvent.setRegionCode(dept.getRegionCode());
+ }
return page.setRecords(baseMapper.selectECallEventPage(page, eCallEvent));
}
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 833a1db..6bc0763 100644
--- a/src/main/java/org/springblade/modules/task/vo/ECallEventVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/ECallEventVO.java
@@ -32,4 +32,9 @@
public class ECallEventVO extends ECallEventEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 区域编号
+ */
+ private String regionCode;
+
}
--
Gitblit v1.9.3