修复最后一个审批人操作报错

flow-workflow/flow-workflow-biz/src/main/java/com/flow/listener/GlobalActivityEventListener.java

@@ -142,12 +142,11 @@ public class GlobalActivityEventListener extends AbstractFlowableEngineEventList
                 String instanceId = entity.getProcessInstanceId();
                 FormInfo form = flowInstanceService.getForm(instanceId);
                 String fromName = form.getFlowDefine().getName();
-                String name = form.getFormName();
 
                 notify.setSubject("新的审批任务" + "-" + fromName);
 
                 // 审批节点
-                notify.setContent(name + "-" + entity.getName());
+                notify.setContent(fromName + "-" + entity.getName());
                 notify.setSender(SecurityContextUtil.getUserId());
                 notify.setType(NotifyEnum.TODO);
                 // 接收者 entity.getAssignee() 下一节点的审批人

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowInstanceServiceImpl.java

@@ -195,7 +195,6 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
     public void reject(String instanceId) {
         FormInfo form = flowInstanceService.getForm(instanceId);
         String fromName = form.getFlowDefine().getName();
-        String name = form.getFormName();
 
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
                 .processInstanceId(instanceId)
@@ -212,7 +211,7 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
         notify.setSubject("申请拒绝");
 
         // notify.setContent(String.format("您申请的流程《%s》已拒绝", processInstance.getName()));
-        notify.setContent(name + "-" + "已完结");
+        notify.setContent(fromName + "-" + "已完结");
 
 
         notify.setSubject("申请拒绝" + "-" + fromName);