1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NewWorkflowServiceImpl.java

@@ -462,6 +462,12 @@ public class NewWorkflowServiceImpl implements INewWorkflowService {
                     // 跳过相邻步骤是同一人
                     skipAdjacentSameApprover(instance);
                 }
+                List<CommonStaff> list = getTaskCandidates(instance.getBusinessKey(),instance.getProcessDefinitionKey());
+//                List<CommonStaff> list =  getTaskCandidates(workflowId,businessKey);
+                for (CommonStaff c :
+                        list) {
+                    geTuiUtils.pushByCid("审核任务","您有新的易粮易运流程，请及时审批。",c.getStaffId());
+                }
 
             }
             // 拒绝
@@ -899,11 +905,7 @@ public class NewWorkflowServiceImpl implements INewWorkflowService {
 
         String statusEn = languageChangeService.findLanguageBySourceType(compId, LanguageChange.LanguageStataus.CHINESE,
                 processIsEnd ? status : status.substring(1), LanguageChange.LanguageStataus.ENGLISH);
-        List<CommonStaff> list =  getTaskCandidates(workflowId,businessKey);
-        for (CommonStaff c :
-                list) {
-            geTuiUtils.pushByCid("审核任务","您有新的易粮易运流程，请及时审批。",c.getStaffId());
-        }
+
         notify(workflowId, taskListener -> taskListener.handleStatusChanged(businessKey, status,
                 !StringUtils.isEmpty(statusEn) ? "Waiting for the " + statusEn : null, processIsEnd));
     }