diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 9783279c1..3f9da6349 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -1,12 +1,11 @@ package org.dromara.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; @@ -118,4 +117,16 @@ public class FlwCategoryController extends BaseController { return toAjax(flwCategoryService.deleteWithValidById(categoryId)); } + + + /** + * 获取流程分类树列表 + * + * @param categoryBo 参数 + */ + @GetMapping("/categoryTree") + public R>> categoryTree(FlowCategoryBo categoryBo) { + return R.ok(flwCategoryService.selectCategoryTreeList(categoryBo)); + } + } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index b6a2dd171..9ed9f9b55 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -1,6 +1,5 @@ package org.dromara.workflow.controller; -import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -13,9 +12,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.service.DefService; import org.dromara.warm.flow.orm.entity.FlowDefinition; -import org.dromara.workflow.domain.bo.FlowCategoryBo; import org.dromara.workflow.domain.vo.FlowDefinitionVo; -import org.dromara.workflow.service.IFlwCategoryService; import org.dromara.workflow.service.IFlwDefinitionService; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -35,8 +32,6 @@ import java.util.List; @RestController @RequestMapping("/workflow/definition") public class FlwDefinitionController extends BaseController { - - private final IFlwCategoryService flwCategoryService; private final IFlwDefinitionService flwDefinitionService; private final DefService defService; @@ -50,16 +45,6 @@ public class FlwDefinitionController extends BaseController { return flwDefinitionService.queryList(flowDefinition, pageQuery); } - /** - * 获取流程分类树列表 - * - * @param categoryBo 参数 - */ - @GetMapping("/categoryTree") - public R>> categoryTree(FlowCategoryBo categoryBo) { - return R.ok(flwCategoryService.selectCategoryTreeList(categoryBo)); - } - /** * 获取历史流程定义列表 *