From edd4eb1d5eed4085bbe80cb65116fe585a13c42f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 23 六月 2025 22:49:34 +0800
Subject: [PATCH] dnc导入完善
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 a389a2b..97d3793 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
@@ -5,6 +5,7 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.TaskService;
+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;
@@ -47,12 +48,22 @@
if (StringUtil.isNoneBlank(processInstanceId, comment)) {
taskService.addComment(taskId, processInstanceId, comment);
}
+
+
// 闈炵┖鍒ゆ柇
if (Func.isEmpty(variables)) {
variables = Kv.create();
}
- // 瀹屾垚浠诲姟
- taskService.complete(taskId, variables);
- return R.success("娴佺▼鎻愪氦鎴愬姛");
+ //鍔犲叆瀹℃壒鐢ㄦ埛
+ variables.put("approveUserNickName",AuthUtil.getNickName());
+ if(variables.containsKey("assignee")){
+ //鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
+ taskService.complete(taskId, variables);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }else {
+ // 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
+ return R.fail("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
+ }
+
}
}
--
Gitblit v1.9.3