Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/service/CylinderFillingMessageService.java

@@ -35,12 +35,14 @@ public class CylinderFillingMessageService extends BaseService<CylinderFillingMe
         Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
         IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
         List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
-        List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
-        if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
-            Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
-            uploadCylinderLogsByOrgCode.getRecords().stream().forEach(x -> {
-                x.setUseUnitCode(map.get(x.getAppId()));
-            });
+        if(appIds.size() >  0){
+            List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
+            if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
+                Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
+                uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
+                    x.setUseUnitCode(map.get(x.getAppId()));
+                });
+            }
         }
         return page;
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/DispatchPaper.java

@@ -98,7 +98,7 @@ public class DispatchPaper extends BaseEntity {
      * 维保单位id 困人救援时为三级响应单位id
      */
 	@TableField("repair_org_id")
-    private Long repairOrgId;
+    private String repairOrgId;
 
     /**
      * 维保单位社会信用代码