yangys
2025-09-17 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
@@ -4,7 +4,6 @@
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
@@ -59,7 +58,8 @@
      if(task.getTaskDefinitionKey().equals("programmingTask") ) {//编制节点
         //记录实际编程员
         variables.put(FlowVariableContants.ACT_PROGRAMMER,Func.toStr(AuthUtil.getUserId()));
         String programOnMachine = Func.toStr(variables.getOrDefault("programOnMachine",FlowContants.N));//是否现场编程
         String programOnMachine = Func.toStr(variables.getOrDefault(FlowVariableContants.PROGRAM_ON_MACHINE,FlowContants.N));//是否现场编程
         if(this.needUploadProgramFile(props.getMachineCode()) && programOnMachine.equals(FlowContants.N)) {
            flowProgramFileService.checkProgramFiles(processInstanceId, FlowContants.Y.equals(operateResult));
         }
@@ -72,7 +72,7 @@
      }else if(task.getTaskDefinitionKey().equals("approveTask")){
         variables.put(FlowVariableContants.ACT_SENIOR,Func.toStr(AuthUtil.getUserId()));
      }
      variables.remove("programOnMachine");//其他节点,忽略现场编程标记
      variables.remove(FlowVariableContants.PROGRAM_ON_MACHINE);//其他节点,忽略现场编程标记
      if (StringUtil.isNoneBlank(processInstanceId, comment)) {
         taskService.addComment(taskId, processInstanceId, comment);
      }