From f604cf4988107bdce6ce9bc596b85a797531b717 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 26 十一月 2021 15:18:11 +0800
Subject: [PATCH] fix 修复提交错误
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
index b0537f2..0f496cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -13,7 +14,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -39,7 +39,7 @@
* 鑾峰彇鑿滃崟鍒楄〃
*/
@ApiOperation("鑾峰彇鑿滃崟鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:menu:list')")
+ @SaCheckPermission("system:menu:list")
@GetMapping("/list")
public AjaxResult<List<SysMenu>> list(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -50,7 +50,7 @@
* 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
+ @SaCheckPermission("system:menu:query")
@GetMapping(value = "/{menuId}")
public AjaxResult<SysMenu> getInfo(@PathVariable Long menuId) {
return AjaxResult.success(menuService.selectMenuById(menuId));
@@ -83,7 +83,7 @@
* 鏂板鑿滃崟
*/
@ApiOperation("鏂板鑿滃崟")
- @PreAuthorize("@ss.hasPermi('system:menu:add')")
+ @SaCheckPermission("system:menu:add")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysMenu menu) {
@@ -92,7 +92,6 @@
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
return AjaxResult.error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
- menu.setCreateBy(getUsername());
return toAjax(menuService.insertMenu(menu));
}
@@ -100,7 +99,7 @@
* 淇敼鑿滃崟
*/
@ApiOperation("淇敼鑿滃崟")
- @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+ @SaCheckPermission("system:menu:edit")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysMenu menu) {
@@ -111,7 +110,6 @@
} else if (menu.getMenuId().equals(menu.getParentId())) {
return AjaxResult.error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
}
- menu.setUpdateBy(getUsername());
return toAjax(menuService.updateMenu(menu));
}
@@ -119,7 +117,7 @@
* 鍒犻櫎鑿滃崟
*/
@ApiOperation("鍒犻櫎鑿滃崟")
- @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+ @SaCheckPermission("system:menu:remove")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
public AjaxResult<Void> remove(@PathVariable("menuId") Long menuId) {
--
Gitblit v1.9.3