Bladeren bron

教务sop修改标题

wangliang 9 maanden geleden
bovenliggende
commit
71c2efe06d

+ 2 - 5
sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -273,10 +273,10 @@ public class ActivitiServiceImpl implements ActivitiService {
                     .singleResult();
             Optional.ofNullable(task).orElseThrow(() -> ExceptionResultEnum.TASK_NO_DATA.exception());
 
-            activitiService.sendSopFlowDoneSms(maxTfCustomFlow.getType(), tfCustomFlowEntity, task.getName(),
-                    Long.parseLong(approveUserIds.get(0)));
             if (tfCustomFlow.getType() == TFCustomTypeEnum.OFFICE_SOP_FLOW
                     || tfCustomFlow.getType() == TFCustomTypeEnum.CLOUD_MARK_SOP_FLOW) {
+                activitiService.sendSopFlowDoneSms(maxTfCustomFlow.getType(), tfCustomFlowEntity, task.getName(),
+                        Long.parseLong(approveUserIds.get(0)));
                 TBCrmDetail tbCrmDetail = (TBCrmDetail) flowApproveParam.getVar().get(SystemConstant.CRM_DETAIL);
                 taskService.setVariable(task.getId(), SystemConstant.CRM_DETAIL, tbCrmDetail);
                 activitiService.sendSopFlowDoneMsg(maxTfCustomFlow.getType(), tfCustomFlowEntity, tfFlowApprove,
@@ -1349,9 +1349,6 @@ public class ActivitiServiceImpl implements ActivitiService {
             flowTaskSmsResult = tfCustomFlowEntityService.getFlowTaskRemindSmsInfo(tfCustomFlowEntity.getCrmNo(),
                     userId);
         }
-        if (Objects.isNull(flowTaskSmsResult)){
-            return;
-        }
         Optional.ofNullable(flowTaskSmsResult).orElseThrow(() -> ExceptionResultEnum.USER_NO_EXISTS.exception());
 
         Map<String, Object> templateParam = new HashMap<>();