From 6303fc2162387b72bfb630189f60098951bb1b87 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 14 Oct 2021 14:51:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/org/CustomerGridDao.xml     | 8 +++++---
 .../main/resources/mapper/org/StatsCustomerAgencyDao.xml  | 8 +++++---
 .../src/main/resources/mapper/user/UserDao.xml            | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
index b4935ce00c..52264cd938 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
@@ -134,9 +134,11 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        <foreach collection="gridIdList" item="gridId" open="AND id IN (" separator="," close=")">
-            #{gridId}
-        </foreach>
+        <if test="gridIdList != null and gridIdList.size() > 0">
+            <foreach collection="gridIdList" item="gridId" open="AND id IN (" separator="," close=")">
+                #{gridId}
+            </foreach>
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
index 85bcc8e4cf..68cab60dd6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
@@ -212,9 +212,11 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        <foreach collection="agencyIdList" item="agencyId" open="AND id IN (" separator="," close=")">
-            #{agencyId}
-        </foreach>
+        <if test="agencyIdList != null and agencyIdList.size() > 0">
+            <foreach collection="agencyIdList" item="agencyId" open="AND id IN (" separator="," close=")">
+                #{agencyId}
+            </foreach>
+        </if>
     </select>
 
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index f71bb10cca..e048aadd1d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -1005,9 +1005,11 @@
         AND gsr.del_flag = '0'
         AND gsr.role_name = '网格员'
         AND cs.customer_id = #{customerId}
-        <foreach collection="staffIdList" item="staffId" open="AND cs.USER_ID IN (" separator="," close=")">
-            #{staffId}
-        </foreach>
+        <if test="staffIdList != null and staffIdList.size() > 0">
+            <foreach collection="staffIdList" item="staffId" open="AND cs.USER_ID IN (" separator="," close=")">
+                #{staffId}
+            </foreach>
+        </if>
     </select>
 
 </mapper>