Merge remote-tracking branches 'remotes/origin/dev_compare_data' and 'remotes/origin/dev_data_sync_user_org_for_yt' into 烟台-政务master

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<OrgData> needInsert = new ArrayList<>();
         // 根组织
         OrgData rootOrg = YantaiApi.getOuInfoByOuGuid(organizationId);

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml

@@ -112,7 +112,7 @@
                             when id = #{item.id} then '处理失败'
                         </when>
                         <otherwise>
-                            when id = #{item.id} then '处理成功'
+                            when id = #{item.id} then ''
                         </otherwise>
                     </choose>
                 </foreach>