Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 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);
   }