From 7bc1d0f521c1d59246f29bcadcc4343f88ceef1c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 15 九月 2025 11:29:30 +0800
Subject: [PATCH] 性能优化+bug调整

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
index 79478a4..acd1439 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
@@ -44,16 +44,16 @@
 	@Override
 	public void completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables) {
 		Task task = currentTask(taskId);
+
+		// 闈炵┖鍒ゆ柇
+		if (Func.isEmpty(variables)) {
+			variables = Kv.create();
+		}
 		String operateResult = this.getApproveResult(variables);
 
 		FlowProgramProperties props = flowCommonService.getProgramProperties(processInstanceId);
 		if(!variables.containsKey("assignee")) {
 			throw new ServiceException("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
-		}
-
-		// 闈炵┖鍒ゆ柇
-		if (Func.isEmpty(variables)) {
-			variables = Kv.create();
 		}
 
 		if(task.getTaskDefinitionKey().equals("programmingTask") ) {//缂栧埗鑺傜偣
@@ -77,11 +77,9 @@
 			taskService.addComment(taskId, processInstanceId, comment);
 		}
 
-		variables.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
+		variables.put(FlowVariableContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
 
-		addApproveRecord(taskId,comment,variables);
-
-		variables.remove(FlowContants.PROCESS_EDITION);//涓嶈鍗囩増浜�
+		variables.remove(FlowVariableContants.PROCESS_EDITION);//涓嶈鍗囩増浜�
 
 		if("confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
 			variables.put(FlowContants.CURE_PROGRAM_USEABLE,operateResult);

--
Gitblit v1.9.3