From 13731fedcccbab64878403a7fdb6179b70202a48 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 25 Nov 2022 17:45:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataSyncConfigServiceImpl.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 934132b517..ae9abc8daf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -1126,26 +1126,26 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl resiInfos.stream().filter(r ->r.getIdCard().equals(e.getIdCard())).forEach(r -> { - e.setGridId(r.getGridId()); - e.setCustomerId(r.getCustomerId()); - e.setAgencyId(r.getAgencyId()); - e.setPids(r.getPids()); - e.setName(r.getName()); - e.setMobile(r.getMobile()); - e.setUserId(r.getUserId()); - e.setUserType("ytPull"); - })); - icTripReportRecordService.insertBatch(entities); - } - if (CollectionUtils.isNotEmpty(needUpdate)){ - // 因为更新字段较多，所以分批操作 - List> needs = ListUtils.partition(needUpdate, NumConstant.TWENTY); - needs.forEach(n -> { - updateTripReportList(n); - }); - } + } + if (CollectionUtils.isNotEmpty(entities)){ + entities.forEach(e -> resiInfos.stream().filter(r ->r.getIdCard().equals(e.getIdCard())).forEach(r -> { + e.setGridId(r.getGridId()); + e.setCustomerId(r.getCustomerId()); + e.setAgencyId(r.getAgencyId()); + e.setPids(r.getPids()); + e.setName(r.getName()); + e.setMobile(r.getMobile()); + e.setUserId(r.getUserId()); + e.setUserType("ytPull"); + })); + icTripReportRecordService.insertBatch(entities); + } + if (CollectionUtils.isNotEmpty(needUpdate)){ + // 因为更新字段较多，所以分批操作 + List> needs = ListUtils.partition(needUpdate, NumConstant.TWENTY); + needs.forEach(n -> { + updateTripReportList(n); + }); } }); }else {