yangys
2025-09-19 9a5abe507d6602f2311ffbe1d7bf25e2b58d3a7a
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
@@ -60,6 +60,7 @@
         variables.put(FlowVariableConstant.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
         String programOnMachine = Func.toStr(variables.getOrDefault(FlowVariableConstant.PROGRAM_ON_MACHINE, FlowConstant.N));//是否现场编程
         //variables.put(FlowVariableConstant.PROGRAM_ON_MACHINE, programOnMachine);
         if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowConstant.N)) {
            flowProgramFileService.checkProgramFiles(processInstanceId, FlowConstant.Y.equals(operateResult));
         }
@@ -72,7 +73,9 @@
      }else if(task.getTaskDefinitionKey().equals("approveTask")){
         variables.put(FlowVariableConstant.ACT_SENIOR,Func.toStr(AuthUtil.getUserId()));
      }
      if (!task.getTaskDefinitionKey().equals("programmingTask")){
      variables.remove(FlowVariableConstant.PROGRAM_ON_MACHINE);//其他节点,忽略现场编程标记
      }
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
      }