From 1911be8941e5fe2705c2c56e74e52bd426468793 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 15:26:34 +0800
Subject: [PATCH] 固化流程,建立node;

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index d86cfcb..c3a583e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -84,30 +84,21 @@
 		if (Func.isEmpty(variables)) {
 			variables = Kv.create();
 		}
-		/*
-		String programIds = null;
-		if(variables.containsKey(FlowContants.PROGRAM_IDS_KEY)){
-			programIds = variables.get("programIds").toString();
-			runtimeService.setVariable(taskId, FlowContants.PROGRAM_IDS_KEY, programIds);
-		}
-		if(StringUtils.isNotEmpty(programIds)) {
-			//杩欏凡缁忔病鐢ㄤ簡锛岀洿鎺ヤ娇鐢ㄤ复鏃舵枃浠�
-			processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
-		}
-		*/
 
 		//鍔犲叆瀹℃壒鐢ㄦ埛
-		variables.put("approveUserNickName",AuthUtil.getNickName());
+		variables.put(FlowContants.LAST_STEP_USER_NICKNAME,AuthUtil.getNickName());
 
 		if(variables.containsKey("assignee")){
 			addApproveRecord(taskId,processInstanceId,comment,variables);
-			//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
-			taskService.complete(taskId, variables);
+
 			//鍦ㄧ紪鍒朵换鍔℃椂锛屽垱寤鸿妭鐐癸紙娌℃湁鑺傜偣鍒欏垱寤猴紝鏈夊氨鐩存帴浣跨敤
 			if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
-
 				ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
 			}
+
+			//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
+			taskService.complete(taskId, variables);
+
 			return R.success("娴佺▼鎻愪氦鎴愬姛");
 		}else {
 			// 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�

--
Gitblit v1.9.3