From f4782aee3b8bcc12ed253ac524e3c9c7d458b32f Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 29 Sep 2020 15:39:53 +0800
Subject: [PATCH] =?UTF-8?q?insert=E4=B9=8B=E5=89=8D=E5=AF=B9list=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenPartyUserRankDataServiceImpl.java    | 13 ++++++++-----
 .../screen/impl/ScreenUserTotalDataServiceImpl.java |  3 +--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java
index 9d165c2b60..0c6815db71 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java
@@ -28,6 +28,7 @@ import com.epmet.service.evaluationindex.screen.ScreenPartyUserRankDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -55,10 +56,12 @@ public class ScreenPartyUserRankDataServiceImpl extends BaseServiceImpl<ScreenPa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void dataClean(List<ScreenPartyUserRankDataEntity> dataList, String customerId, String dateId) {
-        int affectedRows;
-        do{
-        affectedRows = baseDao.deleteBatchByCustomerIdAndDateId(customerId,dateId);
-        }while (affectedRows > NumConstant.ZERO);
-        baseDao.insertBatch(dataList);
+        if(!CollectionUtils.isEmpty(dataList)) {
+            int affectedRows;
+            do {
+                affectedRows = baseDao.deleteBatchByCustomerIdAndDateId(customerId, dateId);
+            } while (affectedRows > NumConstant.ZERO);
+            baseDao.insertBatch(dataList);
+        }
     }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserTotalDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserTotalDataServiceImpl.java
index 63d3810047..ff856eefe2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserTotalDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserTotalDataServiceImpl.java
@@ -51,12 +51,11 @@ public class ScreenUserTotalDataServiceImpl extends BaseServiceImpl<ScreenUserTo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void dataClean(List<ScreenUserTotalDataEntity> list,String customerId) {
+        if(!CollectionUtils.isEmpty(list)){
         int deleteNum;
         do {
             deleteNum = baseDao.deleteUserTotalData(customerId);
         } while (deleteNum > NumConstant.ZERO);
-
-        if(!CollectionUtils.isEmpty(list)){
             baseDao.insertBatch(list);
         }
     }