From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:19:28 +0800
Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
index 17b6755..98825d9 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
@@ -15,6 +15,7 @@
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
+import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.domain.bo.TestLeaveBo;
import org.dromara.workflow.domain.vo.TestLeaveVo;
import org.dromara.workflow.service.ITestLeaveService;
@@ -29,10 +30,11 @@
* @author may
* @date 2023-07-21
*/
+@ConditionalOnEnable
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/demo/leave")
+@RequestMapping("/workflow/leave")
public class TestLeaveController extends BaseController {
private final ITestLeaveService testLeaveService;
@@ -40,7 +42,7 @@
/**
* 鏌ヨ璇峰亣鍒楄〃
*/
- @SaCheckPermission("demo:leave:list")
+ @SaCheckPermission("workflow:leave:list")
@GetMapping("/list")
public TableDataInfo<TestLeaveVo> list(TestLeaveBo bo, PageQuery pageQuery) {
return testLeaveService.queryPageList(bo, pageQuery);
@@ -49,7 +51,7 @@
/**
* 瀵煎嚭璇峰亣鍒楄〃
*/
- @SaCheckPermission("demo:leave:export")
+ @SaCheckPermission("workflow:leave:export")
@Log(title = "璇峰亣", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TestLeaveBo bo, HttpServletResponse response) {
@@ -62,7 +64,7 @@
*
* @param id 涓婚敭
*/
- @SaCheckPermission("demo:leave:query")
+ @SaCheckPermission("workflow:leave:query")
@GetMapping("/{id}")
public R<TestLeaveVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long id) {
@@ -72,7 +74,7 @@
/**
* 鏂板璇峰亣
*/
- @SaCheckPermission("demo:leave:add")
+ @SaCheckPermission("workflow:leave:add")
@Log(title = "璇峰亣", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,7 +85,7 @@
/**
* 淇敼璇峰亣
*/
- @SaCheckPermission("demo:leave:edit")
+ @SaCheckPermission("workflow:leave:edit")
@Log(title = "璇峰亣", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -96,7 +98,7 @@
*
* @param ids 涓婚敭涓�
*/
- @SaCheckPermission("demo:leave:remove")
+ @SaCheckPermission("workflow:leave:remove")
@Log(title = "璇峰亣", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
--
Gitblit v1.9.3