From 2c0ded5042139328e933a03ba0fc863fbfaf53fb Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 21 Sep 2020 13:57:09 +0800
Subject: [PATCH] =?UTF-8?q?group=5Fmain=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E5=80=99bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/impl/GroupExtractServiceImpl.java            | 9 ++++++---
 .../extract/FactOriginGroupMainDailyDao.xml              | 6 ++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java
index 089fa9fdbd..9c664f4007 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/GroupExtractServiceImpl.java
@@ -137,9 +137,12 @@ public class GroupExtractServiceImpl implements GroupExtractService {
 
         List<String> partyIds = userService.getPartymembersByCustomerId(param.getCustomerId());
         List<GridHeartedFormDTO> heartedIds = userService.getWarmHeartedByCustomerId(param.getCustomerId());
-
-        factOriginGroupMainDailyDao.updatePartyFlag(partyIds,param.getCustomerId());
-        factOriginGroupMainDailyDao.updateHeartedFlag(heartedIds,param.getCustomerId());
+        if(!partyIds.isEmpty()) {
+            factOriginGroupMainDailyDao.updatePartyFlag(partyIds, param.getCustomerId());
+        }
+        if(!heartedIds.isEmpty()) {
+            factOriginGroupMainDailyDao.updateHeartedFlag(heartedIds, param.getCustomerId());
+        }
     }
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
index d07e74fae7..da7cb183e7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginGroupMainDailyDao.xml
@@ -71,8 +71,7 @@
         <where>
         DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
-        AND
-        <foreach collection="list" item="ownerId" open="( " separator=" OR " close=" ) ">
+        <foreach collection="list" item="ownerId" open="AND ( " separator=" OR " close=" ) ">
             GROUP_OWNER_ID = #{ownerId}
         </foreach>
         </where>
@@ -84,8 +83,7 @@
         <where>
             DEL_FLAG = '0'
             AND CUSTOMER_ID = #{customerId}
-            AND
-            <foreach collection="list" item="item" open="( " separator=" OR " close=" ) ">
+            <foreach collection="list" item="item" open="AND ( " separator=" OR " close=" ) ">
                 (GROUP_OWNER_ID = #{item.userId} AND GRID_ID = #{item.gridId})
             </foreach>
         </where>