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); 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 ''