From 4d15b0b7853292b3f2a80a23af19955375f12e80 Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期二, 20 六月 2023 11:09:39 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java index 8aaba6c..bc67b15 100644 --- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java +++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowTaskUserController.java @@ -8,6 +8,8 @@ import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 娴佺▼task瀹℃壒鎺у埗 @@ -24,11 +26,12 @@ /** * 娴佺▼task瀹℃壒浜哄憳鍒楄〃 + * ProcessTemplateTypeEnum * @return */ @GetMapping("list") - public R<FlowTaskUserC> list() { - return R.data(taskUserService.getUser()); + public R<Object> list(String type,String templateId) { + return R.data(taskUserService.getUser(type,templateId)); } /** -- Gitblit v1.9.3