From 5efb25463fb6a6825ab8c85b880815af32d37515 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 11 五月 2024 16:38:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java
index 30e9443..4b33b05 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java
@@ -1,13 +1,16 @@
 package com.example.erp.controller.userInfo;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.example.erp.common.Result;
+import com.example.erp.entity.userInfo.Role;
 import com.example.erp.service.userInfo.RoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
+@Api(value="瑙掕壊controller",tags={"瑙掕壊鎿嶄綔鎺ュ彛"})
 @RequestMapping("/role")
 public class RoleController {
     private final RoleService roleService;
@@ -16,8 +19,20 @@
         this.roleService = roleService;
     }
 
+
+    @ApiOperation("鏌ヨ鎵�鏈夎鑹�")
+    @SaCheckPermission("roleList.search")
     @GetMapping("/findAll")
     public Result findAll(){
         return Result.seccess(roleService.findAll());
     }
+
+
+    @ApiOperation("鏂板瑙掕壊")
+    @SaCheckPermission("roleList.add")
+    @PostMapping("/add")
+    public Result add(@RequestBody Role role){
+        return Result.seccess(roleService.add(role));
+
+    }
 }

--
Gitblit v1.8.0