From 18f848916fd1d0e915bb51148fa85609f335aaaa Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期四, 03 六月 2021 14:48:54 +0800
Subject: [PATCH] 用户权限更新
---
src/main/java/com/whyc/service/UserRoleService.java | 3 +++
src/main/java/com/whyc/service/LoginService.java | 11 ++++++++++-
src/main/java/com/whyc/service/UserService.java | 5 ++++-
src/main/java/com/whyc/controller/RoleController.java | 4 ++--
src/main/java/com/whyc/service/RoleService.java | 5 ++++-
5 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RoleController.java b/src/main/java/com/whyc/controller/RoleController.java
index 0749913..fca64d2 100644
--- a/src/main/java/com/whyc/controller/RoleController.java
+++ b/src/main/java/com/whyc/controller/RoleController.java
@@ -168,8 +168,8 @@
/**==============鐢ㄦ埛-瑙掕壊-鑿滃崟================**/
-// @GetMapping("allMenus")
-// @ApiOperation(value = "鑾峰彇鎵�鏈夎彍鍗�")
+ @GetMapping("allMenus")
+ @ApiOperation(value = "鑾峰彇鎵�鏈夎彍鍗�")
public List<Menu> getAllMenu(){
return roleMenuService.getAllMenus();
}
diff --git a/src/main/java/com/whyc/service/LoginService.java b/src/main/java/com/whyc/service/LoginService.java
index 2018bbc..e3eaa32 100644
--- a/src/main/java/com/whyc/service/LoginService.java
+++ b/src/main/java/com/whyc/service/LoginService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
import com.whyc.dto.UserLoginInfo;
+import com.whyc.mapper.MenuMapper;
import com.whyc.mapper.RoleMenuMapper;
import com.whyc.mapper.UserMapper;
import com.whyc.pojo.Menu;
@@ -28,6 +29,9 @@
public class LoginService {
@Resource
private UserMapper userMapper;
+
+ @Resource
+ private MenuMapper menuMapper;
@Resource
private RoleMenuMapper roleMenuMapper;
@@ -63,7 +67,12 @@
info.setUsername(userName);
info.setTimestamp(System.currentTimeMillis());
info.setUser(user);
- info.setMenus(menus);
+ if ("superadmin".equals(user.getName())){
+ List<Menu> menuList = menuMapper.selectList(null);
+ info.setMenus(menuList);
+ }else{
+ info.setMenus(menus);
+ }
return new Response<>().set(1,info);
}
return new Response<>().set(0,false);
diff --git a/src/main/java/com/whyc/service/RoleService.java b/src/main/java/com/whyc/service/RoleService.java
index 0467571..ab2c29f 100644
--- a/src/main/java/com/whyc/service/RoleService.java
+++ b/src/main/java/com/whyc/service/RoleService.java
@@ -29,7 +29,9 @@
public List<Role> getAll() {
- return mapper.selectList(null);
+ QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
+ queryWrapper.ne("name","admin");
+ return mapper.selectList(queryWrapper);
}
@@ -37,6 +39,7 @@
QueryWrapper<Role> queryWrapper = new QueryWrapper<>(role);
queryWrapper.or().like(StringUtils.isNotEmpty(role.getSearch()) ,"label",role.getSearch());
queryWrapper.or().like(StringUtils.isNotEmpty(role.getSearch()) ,"description",role.getSearch());
+ queryWrapper.ne("name","superadmin");
List<Role> list = mapper.selectList(queryWrapper);
for (Role role1: list) {
QueryWrapper<UserRole> userRoleQueryWrapper = new QueryWrapper<>();
diff --git a/src/main/java/com/whyc/service/UserRoleService.java b/src/main/java/com/whyc/service/UserRoleService.java
index 2a17ae3..6ac3835 100644
--- a/src/main/java/com/whyc/service/UserRoleService.java
+++ b/src/main/java/com/whyc/service/UserRoleService.java
@@ -85,6 +85,9 @@
public Response updateRoleUser(int roleId,int[] userIds){
QueryWrapper<UserRole> queryWrapper = new QueryWrapper<UserRole>().eq("role_id",roleId);
mapper.delete(queryWrapper);
+ if (userIds.length==0){
+ return new Response().setMsg(1,"鏇存柊鎴愬姛");
+ }
List<UserRole> list = new ArrayList<>();
for (int userId:userIds) {
UserRole userRole = new UserRole();
diff --git a/src/main/java/com/whyc/service/UserService.java b/src/main/java/com/whyc/service/UserService.java
index de61a37..4fd0a74 100644
--- a/src/main/java/com/whyc/service/UserService.java
+++ b/src/main/java/com/whyc/service/UserService.java
@@ -76,7 +76,9 @@
public List<User> getAll() {
- List<User> users = userMapper.selectList(null);
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.ne("name","superadmin");
+ List<User> users = userMapper.selectList(queryWrapper);
return users;
}
@@ -90,6 +92,7 @@
queryWrapper.or().like(StringUtils.isNotEmpty(user.getSearch()), "real_name", user.getSearch());
queryWrapper.or().like(StringUtils.isNotEmpty(user.getSearch()), "phone", user.getSearch());
queryWrapper.or().like(StringUtils.isNotEmpty(user.getSearch()), "email", user.getSearch());
+ queryWrapper.ne("name","superadmin");
IPage<User> page = userMapper.selectPage(new Page<>(pageNum, pageSize), queryWrapper);
return new Response<IPage<User>>().set(1, page);
}
--
Gitblit v1.9.1