Przeglądaj źródła

被拒绝的流程不要重新开始

buzhanyi 1 rok temu
rodzic
commit
27a260fc1b

+ 1 - 1
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/CostInfoController.java

@@ -184,7 +184,7 @@ public class CostInfoController {
             Integer flowStatus = flowWorkOrderService.getFlowWorkOrderByProcessInstanceId(taskVo.getProcessInstanceId()).getFlowStatus();
             if (flowStatus == 2) {
                 flowTaskVoList.remove(taskVo);
-                break;
+                //break;
             }
         }
         for (FlowTaskVo taskVo : flowTaskVoList) {

+ 3 - 3
application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/SubmitUserTaskController.java

@@ -170,9 +170,9 @@ public class SubmitUserTaskController {
         String dataId = instance.getBusinessKey();
         // 这里把传阅数据放到任务变量中,是为了避免给流程数据操作方法增加额外的方法调用参数。
         if (MapUtil.isNotEmpty(subVo.getCopyDat())) {
-            //if (taskVariableData == null) {
-            //    taskVariableData = new JSONObject();
-            //}
+            if (subVo.getTaskVariableData() == null) {
+                subVo.setTaskVariableData(new JSONObject());
+            }
             subVo.getTaskVariableData().put(FlowConstant.COPY_DATA_KEY, subVo.getCopyDat());
         }
         FlowTaskComment flowTaskComment = BeanUtil.copyProperties(subVo.getFlowTaskCommentDto(), FlowTaskComment.class);