From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 e7e0530..00783bf 100644
--- a/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml
@@ -42,12 +42,23 @@
<if test="eCallEvent.realName!=null and eCallEvent.realName!=''">
and jece.real_name like concat('%',#{eCallEvent.realName},'%')
</if>
- <if test="eCallEvent.regionCode!=null and eCallEvent.regionCode!=''">
- and jece.community_code like concat('%',#{eCallEvent.regionCode},'%')
+ <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