From 86079d1c2bd7981165487e6e08d2399b80687f6e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 九月 2025 14:21:49 +0800
Subject: [PATCH] 工控网导出使用实际编程人匹配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
index 88abf59..44016d0 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/MyFlowController.java
@@ -19,6 +19,7 @@
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowTransferService;
import org.springblade.mdm.flow.vo.FlowVO;
+import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
import org.springblade.system.feign.IUserSearchClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
@@ -105,16 +106,22 @@
}
/**
- * 寰呭姙浠诲姟鍒楄〃椤�
+ * 澶勭悊浜轰笅鎷夋暟鎹�
*/
@GetMapping("flow-user-list")
@ApiOperationSupport(order = 3)
- @Operation(summary = "鐢ㄦ埛涓嬫媺鏁版嵁", description = "鐢ㄦ埛涓嬫媺鏁版嵁")
+ @Operation(summary = "澶勭悊浜轰笅鎷夋暟鎹�", description = "澶勭悊浜轰笅鎷夋暟鎹�")
public R<List<MdmUser>> flowUserList(@Parameter(description = "閮ㄩ棬ID") String deptId, String taskId) {
-
return R.data(mdmUserService.listByDeptAndRoleAlias());
}
+ @GetMapping("flow-user-tree")
+ @ApiOperationSupport(order = 3)
+ @Operation(summary = "澶勭悊浜轰笅鎷夋暟鎹�-鏍戝舰", description = "澶勭悊浜轰笅鎷夋暟鎹�")
+ public R<List<ProgramNodeVO>> flowUserTree(@Parameter(description = "閮ㄩ棬ID") String deptId, String taskId) {
+ return R.data(mdmUserService.flowUserTree());
+ }
+
/**
* 涓婁竴姝ュ鎵逛汉鏌ヨ
*/
--
Gitblit v1.9.3