From 83905db7170ea5981949e0f4b56695fb4ee02c83 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:50:21 +0800
Subject: [PATCH] !69 同步dev分支 Merge pull request !69 from 疯狂的狮子Li/dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index c36c3e6..5701aa1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -181,9 +181,7 @@
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
- startPage();
- List<SysUser> list = userService.selectAllocatedList(user);
- return getDataTable(list);
+ return userService.selectAllocatedList(user);
}
/**
@@ -193,9 +191,7 @@
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
- startPage();
- List<SysUser> list = userService.selectUnallocatedList(user);
- return getDataTable(list);
+ return userService.selectUnallocatedList(user);
}
/**
@@ -212,6 +208,7 @@
/**
* 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛
*/
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
@@ -222,6 +219,7 @@
/**
* 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈
*/
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
--
Gitblit v1.9.3