From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java b/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java
index 70b03bc..46f5a55 100644
--- a/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java
+++ b/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java
@@ -51,7 +51,7 @@
@RequestMapping(AppConstant.APPLICATION_FLOW_NAME + "/manager")
@AllArgsConstructor
@Api(value = "流程管理接口", tags = "流程管理接口")
-@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+//@PreAuth("hasAnyRole('administrator', 'admin','jdgly','sqgly')")
@ApiIgnore
public class FlowManagerController {
@@ -63,8 +63,8 @@
@GetMapping("list")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "分页", notes = "传入流程类型")
- public R<IPage<FlowProcess>> list(@ApiParam("流程类型") String category, Query query, @RequestParam(required = false, defaultValue = "1") Integer mode) {
- IPage<FlowProcess> pages = flowEngineService.selectProcessPage(Condition.getPage(query), category, mode);
+ public R<IPage<FlowProcess>> list(@ApiParam("流程类型") String category, @RequestParam(value = "name", required = false) String name, Query query, @RequestParam(required = false, defaultValue = "1") Integer mode) {
+ IPage<FlowProcess> pages = flowEngineService.selectProcessPage(Condition.getPage(query), category, name, mode);
return R.data(pages);
}
--
Gitblit v1.9.3