From fa33aeae4c96420668f1bf6f82594c199d7e9a6b Mon Sep 17 00:00:00 2001 From: pig777 Date: Tue, 27 Oct 2020 16:52:49 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.#1908?= =?UTF-8?q?=20=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/controller/SysRoleController.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java index e5225e1e3..7c0eb4009 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java @@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.api.vo.RoleVO; -import com.pig4cloud.pigx.admin.service.SysRoleMenuService; import com.pig4cloud.pigx.admin.service.SysRoleService; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.util.R; @@ -51,8 +50,6 @@ public class SysRoleController { private final SysRoleService sysRoleService; - private final SysRoleMenuService sysRoleMenuService; - /** * 通过ID查询角色信息 * @param id ID @@ -114,11 +111,12 @@ public class SysRoleController { /** * 分页查询角色信息 * @param page 分页对象 + * @param role 查询条件 * @return 分页对象 */ @GetMapping("/page") - public R getRolePage(Page page) { - return R.ok(sysRoleService.page(page, Wrappers.emptyWrapper())); + public R getRolePage(Page page,SysRole role) { + return R.ok(sysRoleService.page(page, Wrappers.query(role))); } /**