1.使用标志联调修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
@@ -1034,7 +1035,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     private String buildEmergencyTel(IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo) {
-        return idxBizJgMaintenanceRecordInfo.getMeMasterPhone()  + "/" + idxBizJgMaintenanceRecordInfo.getMeMaster1Phone();
+        if(StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMasterPhone()) && StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMaster1Phone())){
+            return idxBizJgMaintenanceRecordInfo.getMeMasterPhone()  + "/" + idxBizJgMaintenanceRecordInfo.getMeMaster1Phone();
+        }
+        return StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMasterPhone()) ? idxBizJgMaintenanceRecordInfo.getMeMasterPhone() : StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMaster1Phone()) ? idxBizJgMaintenanceRecordInfo.getMeMaster1Phone() : "";
     }
 
     /**