From 4324ab67e0266fc1d70c2a05309934fd7971f872 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 二月 2024 21:14:10 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 ac71c19..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,14 +2,16 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
-import com.zy.asrs.wcs.sys.controller.param.PageParam;
+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.*;
-
-import java.util.List;
+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;
/**
* Created by vincent on 2/13/2024
@@ -24,10 +26,9 @@
@PreAuthorize("hasAuthority('sys:role:list')")
@OperationLog
@PostMapping("/role/page")
- public R updateInfo(@RequestBody PageParam param) {
- System.out.println(param.get("condition"));
- List<Role> list = roleService.list();
- return R.ok().add(list);
+ 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