From 74ea9417c0ab36cb2ad46b847d15d0c39f61af7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 14 Feb 2020 21:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EpidemicSentryPostServiceImpl.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java
index 67172a976..243402c8f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/EpidemicSentryPostServiceImpl.java
@@ -131,7 +131,8 @@ public class EpidemicSentryPostServiceImpl extends BaseServiceImpl<EpidemicSentr
     }
 
     private List<EpidemicSentryPostDTO> updataOrSaveExcel(List<EpidemicSentryPostExcel> epidemicExcelList, List<EpidemicSentryPostEntity> oldEntityList) {
-        List<EpidemicSentryPostDTO> newEpidemicList = new ArrayList<>();
+        List<EpidemicSentryPostExcel> newEpidemicList = new ArrayList<>();
+        newEpidemicList.addAll(epidemicExcelList);
         QueryWrapper<EpidemicSentryPostEntity> wrapper;
         for (EpidemicSentryPostExcel item : epidemicExcelList) {
             if (StringUtils.isNotBlank(item.getThirdSentryPostId())) {
@@ -144,12 +145,11 @@ public class EpidemicSentryPostServiceImpl extends BaseServiceImpl<EpidemicSentr
                     wrapper = new QueryWrapper<>();
                     wrapper.eq("third_sentry_post_id", epidemicSentryPostEntity.getThirdSentryPostId());
                     update(epidemicSentryPostEntity, wrapper);
-                    epidemicExcelList.remove(item);
+                    newEpidemicList.remove(item);
                 }
             }
         }
-         newEpidemicList = ConvertUtils.sourceToTarget(epidemicExcelList, EpidemicSentryPostDTO.class);
-        return newEpidemicList;
+        return ConvertUtils.sourceToTarget(newEpidemicList, EpidemicSentryPostDTO.class);
     }
 
 }
\ No newline at end of file