From 52a6d76d9a6c1c43f824b2aa4d2572478c49f7a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 二月 2024 21:19:37 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
index 244ef07..1bb4ada 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
@@ -2,9 +2,13 @@
 
 import com.zy.asrs.framework.common.R;
 import com.zy.asrs.wcs.common.annotation.OperationLog;
-import com.zy.asrs.wcs.sys.entity.User;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.sys.entity.Role;
+import com.zy.asrs.wcs.sys.service.RoleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,11 +20,15 @@
 @RequestMapping("/api")
 public class RoleController extends BaseController {
 
-    @PreAuthorize("hasAuthority('sys:auth:user')")
+    @Autowired
+    private RoleService roleService;
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
     @OperationLog
-    @PutMapping("/role/page")
-    public R updateInfo(@RequestBody User user) {
-        return R.ok();
+    @PostMapping("/role/page")
+    public R updateInfo(@RequestBody BaseParam param) {
+        PageParam<Role, BaseParam> page = new PageParam<>(param);
+        return R.ok().add(roleService.page(page, page.getWrapper()));
     }
 
 }

--
Gitblit v1.9.1