Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into qtz

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java

@@ -309,9 +309,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
                        req.setTemplateType(TemplateTypeEnum.MEDIATION_APPLICATION.getCode());
                     // todo 部署放开
                     caseApplicationService.generateApplication(req);
-
             // 保存案件附件
-
             if (CollectionUtil.isNotEmpty(caseAttachList)) {
                 for (MsCaseAttach caseAttach : caseAttachList) {
                     caseAttach.setCaseAppliId(caseApplication.getId());
@@ -1016,7 +1014,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
             // 被申请人预约
             // 新增日志
             CaseLogUtils.insertCaseLog(vo.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "被申请人选择调解员");
-            if (StrUtil.isEmpty(msCaseAffiliate.getContactTelphoneAgent())) {
+            if (StrUtil.isEmpty(msCaseAffiliate.getContactTelphoneAgent())|| StrUtil.isEmpty(msCaseAffiliate.getApplicationPhone())) {
                 return AjaxResult.error("申请代理人手机号为空");
             }
             // 判断申请人是否预约