From 6f981a41feea6ba863fd2fa3bc4cb11fadccb793 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 2 Jun 2020 17:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E6=88=90=E5=91=98=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/PartyUserGroupDao.xml   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml
index 6fa2a4fe..e3e8d24a 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyUserGroupDao.xml
@@ -94,6 +94,7 @@
         UPDATED_BY,
         UPDATED_TIME,
         GRID,
+        ALL_DEPT_IDS,
         ((case when bannedTime = 0
         then '未禁言'
         when bannedTime = 1
@@ -124,11 +125,21 @@
         CREATED_TIME,
         UPDATED_BY,
         UPDATED_TIME,
+        ALL_DEPT_IDS,
         GRID,DATEDIFF(BANNED_END_TIME,BANNED_START_TIME) as bannedTime from epdc_party_user_group)a
         where DEL_FLAG='0'
          <if test="partyGroupId != null and partyGroupId!=''">
             and PARTY_GROUP_ID = #{partyGroupId}
          </if>
+        <if test="mobile != null and mobile!=''">
+            and MOBILE like concat('%',#{mobile},'%')
+        </if>
+        <if test="nickname != null and nickname!=''">
+            and NICKNAME like concat('%',#{nickname},'%')
+        </if>
+        <if test="gridId != null and gridId != ''">
+            and find_in_set(#{gridId},ALL_DEPT_IDS)
+        </if>
          order by CREATED_TIME desc
     </select>
 </mapper>
\ No newline at end of file