From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index e47b1e8..08ebf96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ArrayUtil;
import com.ruoyi.common.annotation.Log;
@@ -15,7 +16,6 @@
import io.swagger.annotations.ApiParam;
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.*;
@@ -41,7 +41,7 @@
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
@ApiOperation("鑾峰彇閮ㄩ棬鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ @SaCheckPermission("system:dept:list")
@GetMapping("/list")
public AjaxResult<List<SysDept>> list(SysDept dept) {
List<SysDept> depts = deptService.selectDeptList(dept);
@@ -52,7 +52,7 @@
* 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級
*/
@ApiOperation("鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級")
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ @SaCheckPermission("system:dept:list")
@GetMapping("/list/exclude/{deptId}")
public AjaxResult<List<SysDept>> excludeChild(@ApiParam("閮ㄩ棬ID") @PathVariable(value = "deptId", required = false) Long deptId) {
List<SysDept> depts = deptService.selectDeptList(new SysDept());
@@ -65,7 +65,7 @@
* 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:dept:query')")
+ @SaCheckPermission("system:dept:query")
@GetMapping(value = "/{deptId}")
public AjaxResult<SysDept> getInfo(@ApiParam("閮ㄩ棬ID") @PathVariable Long deptId) {
deptService.checkDeptDataScope(deptId);
@@ -99,7 +99,7 @@
* 鏂板閮ㄩ棬
*/
@ApiOperation("鏂板閮ㄩ棬")
- @PreAuthorize("@ss.hasPermi('system:dept:add')")
+ @SaCheckPermission("system:dept:add")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysDept dept) {
@@ -113,7 +113,7 @@
* 淇敼閮ㄩ棬
*/
@ApiOperation("淇敼閮ㄩ棬")
- @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+ @SaCheckPermission("system:dept:edit")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysDept dept) {
@@ -132,7 +132,7 @@
* 鍒犻櫎閮ㄩ棬
*/
@ApiOperation("鍒犻櫎閮ㄩ棬")
- @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+ @SaCheckPermission("system:dept:remove")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
public AjaxResult<Void> remove(@ApiParam("閮ㄩ棬ID涓�") @PathVariable Long deptId) {
--
Gitblit v1.9.3