From 195e2c617d04ca24dcbf83294782ecaa100aaf08 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 15:04:07 +0800 Subject: [PATCH 1/2] emm --- .../controller/yantai/DataSyncUserAndOrgServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java index 5f2ae5c4fc..16d281ed0c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/yantai/DataSyncUserAndOrgServiceImpl.java @@ -67,7 +67,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService Integer delSize = NumConstant.ZERO; do { delSize = dataSyncUserDataService.deleteByCustomerId(customerId); - }while (delSize == NumConstant.ONE_THOUSAND); + }while (null != delSize && delSize == NumConstant.ONE_THOUSAND); // 缓存初始化staffs epmetUserOpenFeignClient.allCustomerStaffInCache(customerId); Integer no = NumConstant.ONE; @@ -115,7 +115,7 @@ public class DataSyncUserAndOrgServiceImpl implements DataSyncUserAndOrgService Integer delSize = NumConstant.ZERO; do { delSize = dataSyncOrgDataService.deleteByCustomerId(YT_CUSTOMER_ID); - }while (delSize == NumConstant.ONE_THOUSAND); + }while (null != delSize && delSize == NumConstant.ONE_THOUSAND); List needInsert = new ArrayList<>(); // 根组织 OrgData rootOrg = YantaiApi.getOuInfoByOuGuid(organizationId); From 970e59652d2293733e56a936fb31347e04a026a8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 25 Oct 2022 15:18:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DataSyncRecordDisabilityDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index bca57f359e..1d16260551 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml @@ -112,7 +112,7 @@ when id = #{item.id} then '处理失败' - when id = #{item.id} then '处理成功' + when id = #{item.id} then ''