From 938a43082372b4b1d10f504f57ea94901eff7a80 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Sun, 7 Jun 2020 10:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E7=AE=A1=E7=90=86=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/PartyGroupDao.xml       | 10 ++++++----
 .../main/resources/mapper/PartyGroupOfficialsDao.xml  | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml
index 7271b921..2a775d5d 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml
@@ -32,10 +32,12 @@
             epdc_party_group
         WHERE
             DEL_FLAG = '0'
-        and DEPT_ID  IN
-        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
-            #{deptIdItem}
-        </foreach>
+        <if test="deptIdList!=null and  deptIdList.size()>0">
+            and DEPT_ID  IN
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectListOfPartyGroupDTO" resultType="com.elink.esua.epdc.dto.PartyGroupDTO">
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
index 8c03d697..f042d39f 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
@@ -47,10 +47,13 @@
         t1.PARTY_GROUP_NAME
         from epdc_party_group_officials t
         left join epdc_party_group t1 on t.PARTY_GROUP_ID = t1.ID and t1.DEL_FLAG='0'
-        where t.DEL_FLAG ='0' and t.GRID_ID  IN
-        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
-            #{deptIdItem}
-        </foreach>
+        where t.DEL_FLAG ='0'
+        <if test="deptIdList!=null and  deptIdList.size()>0">
+            and  t.GRID_ID  IN
+            <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+                #{deptIdItem}
+            </foreach>
+        </if>
         <if test="groupId!=null and groupId != ''">
             and t.PARTY_GROUP_ID = #{groupId}
         </if>