From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
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..00783bf 100644
--- a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
@@ -28,18 +28,37 @@
<!--自定义分页查询-->
<select id="selectECallEventPage" resultType="org.springblade.modules.task.vo.ECallEventVO">
select
- *
- from jczz_e_call_event
- where is_deleted = 0
+ jece.*,
+ br.name as communityName
+ from jczz_e_call_event jece
+ left join blade_region br on br.code = jece.community_code
+ where jece.is_deleted = 0
<if test="eCallEvent.name!=null and eCallEvent.name!=''">
- and name like concat('%',#{eCallEvent.name},'%')
+ and jece.name like concat('%',#{eCallEvent.name},'%')
</if>
<if test="eCallEvent.phone!=null and eCallEvent.phone!=''">
- and phone like concat('%',#{eCallEvent.phone},'%')
+ and jece.phone like concat('%',#{eCallEvent.phone},'%')
</if>
<if test="eCallEvent.realName!=null and eCallEvent.realName!=''">
- and real_name like concat('%',#{eCallEvent.realName},'%')
+ and jece.real_name like concat('%',#{eCallEvent.realName},'%')
</if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jece.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jece.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="eCallEvent.communityName!=null and eCallEvent.communityName!=''">
+ and br.name like concat('%',#{eCallEvent.communityName},'%')
+ </if>
+ order by jece.create_time desc,jece.id desc
</select>
--
Gitblit v1.9.3