Explorar el Código

Fx 修复 AUTO_PASS 变量取值错误

Yue hace 4 días
padre
commit
12585faa07

+ 3 - 2
SERVER/VberAdminPlusV3/vber-modules/vber-workflow/src/main/java/com/vber/workflow/service/impl/FlwTaskServiceImpl.java

@@ -231,8 +231,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
         if (BusinessStatusEnum.isDraftOrCancelOrBack(ins.getFlowStatus())) {
             variables.put(SUBMIT, true);
         }
+        Map<String, Object> insVariableMap = ins.getVariableMap();
         // 设置弹窗处理人
-        Map<String, Object> assigneeMap = setPopAssigneeMap(completeTaskBo.getAssigneeMap(), ins.getVariableMap());
+        Map<String, Object> assigneeMap = setPopAssigneeMap(completeTaskBo.getAssigneeMap(), insVariableMap);
         if (CollUtil.isNotEmpty(assigneeMap)) {
             variables.putAll(assigneeMap);
         }
@@ -248,7 +249,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
                 .flowStatus(BusinessStatusEnum.WAITING.getStatus())
                 .hisStatus(TaskStatusEnum.PASS.getStatus())
                 .hisTaskExt(completeTaskBo.getFileId());
-        Boolean autoPass = Convert.toBool(variables.getOrDefault(AUTO_PASS, false));
+        Boolean autoPass = Convert.toBool(insVariableMap.getOrDefault(AUTO_PASS, false));
         skipTask(taskId, flowParams, flowTask.getInstanceId(), autoPass);
         return true;
     }