From 195cdca1fae35cc9d7750ec2446412ef6cfb41fe Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期四, 03 六月 2021 15:26:20 +0800
Subject: [PATCH] 用户权限更新superuser
---
src/main/java/com/whyc/service/UserRoleService.java | 11 ++++++++---
src/main/java/com/whyc/service/LoginService.java | 2 +-
src/main/java/com/whyc/service/UserService.java | 11 +++++++++--
src/main/java/com/whyc/service/RoleService.java | 11 +++++++++--
4 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/LoginService.java b/src/main/java/com/whyc/service/LoginService.java
index e3eaa32..6e5f042 100644
--- a/src/main/java/com/whyc/service/LoginService.java
+++ b/src/main/java/com/whyc/service/LoginService.java
@@ -67,7 +67,7 @@
info.setUsername(userName);
info.setTimestamp(System.currentTimeMillis());
info.setUser(user);
- if ("superadmin".equals(user.getName())){
+ if ("superuser".equals(user.getName())){
List<Menu> menuList = menuMapper.selectList(null);
info.setMenus(menuList);
}else{
diff --git a/src/main/java/com/whyc/service/RoleService.java b/src/main/java/com/whyc/service/RoleService.java
index ab2c29f..0ed73b8 100644
--- a/src/main/java/com/whyc/service/RoleService.java
+++ b/src/main/java/com/whyc/service/RoleService.java
@@ -30,7 +30,7 @@
public List<Role> getAll() {
QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("name","admin");
+ queryWrapper.ne("name","superuser");
return mapper.selectList(queryWrapper);
}
@@ -39,7 +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");
+ queryWrapper.ne("name","superuser");
List<Role> list = mapper.selectList(queryWrapper);
for (Role role1: list) {
QueryWrapper<UserRole> userRoleQueryWrapper = new QueryWrapper<>();
@@ -88,6 +88,9 @@
public Response updateRoleState(int roleId,int state){
Role role = mapper.selectById(roleId);
+ if ("superuser".equals(role.getName())){
+ return new Response().setMsg(0,"鏇存柊澶辫触");
+ }
role.setState(state);
if(mapper.updateById(role)>0){
if (state==0){
@@ -101,6 +104,10 @@
}
public Response deleteRole(int roleId){
+ Role role = mapper.selectById(roleId);
+ if ("superuser".equals(role.getName())){
+ return new Response().setMsg(0,"鍒犻櫎澶辫触");
+ }
if(mapper.deleteById(roleId)>0){
return new Response().setMsg(1, "鍒犻櫎鎴愬姛");
}else{
diff --git a/src/main/java/com/whyc/service/UserRoleService.java b/src/main/java/com/whyc/service/UserRoleService.java
index 6ac3835..d0e475a 100644
--- a/src/main/java/com/whyc/service/UserRoleService.java
+++ b/src/main/java/com/whyc/service/UserRoleService.java
@@ -66,7 +66,9 @@
//缁戝畾鐢ㄦ埛
public Response getUsersByRoleId(int roleId){
- List<User> userList = userMapper.selectList(null);
+ QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+ userQueryWrapper.ne("name","superuser");
+ List<User> userList = userMapper.selectList(userQueryWrapper);
QueryWrapper<UserRole> queryWrapper= new QueryWrapper();
queryWrapper.eq("role_id",roleId);
List<UserRole> userRoleList = mapper.selectList(queryWrapper);
@@ -108,8 +110,11 @@
queryWrapper.select("user_id").eq("role_id",roleId);
List<UserRole> userIds = mapper.selectList(queryWrapper);
List<User> userList = new ArrayList<>();
- for (UserRole userRole:userIds) {
- User user = userMapper.selectById(userRole.getUserId());
+ for (int i = 0; i < userIds.size(); i++) {
+ User user = userMapper.selectById(userIds.get(i).getUserId());
+ if ("superuser".equals(user.getName())){
+ continue;
+ }
userList.add(user);
}
PageInfo<User> pageInfo = new PageInfo<>(userList);
diff --git a/src/main/java/com/whyc/service/UserService.java b/src/main/java/com/whyc/service/UserService.java
index 4fd0a74..d3c1835 100644
--- a/src/main/java/com/whyc/service/UserService.java
+++ b/src/main/java/com/whyc/service/UserService.java
@@ -77,7 +77,7 @@
public List<User> getAll() {
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.ne("name","superadmin");
+ queryWrapper.ne("name","superuser");
List<User> users = userMapper.selectList(queryWrapper);
return users;
}
@@ -92,7 +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");
+ queryWrapper.ne("name","superuser");
IPage<User> page = userMapper.selectPage(new Page<>(pageNum, pageSize), queryWrapper);
return new Response<IPage<User>>().set(1, page);
}
@@ -118,6 +118,9 @@
public Response updateUserFreeze(int id, int state) {
User user = userMapper.selectById(id);
+ if ("superuser".equals(user.getName())){
+ return new Response().setMsg(0, "鏇存柊澶辫触");
+ }
user.setState(state);
if (userMapper.updateById(user) > 0) {
if (state == 0) {
@@ -132,6 +135,10 @@
public Response delete(int id) {
+ User user = userMapper.selectById(id);
+ if ("superuser".equals(user.getName())){
+ return new Response().setMsg(0, "鍒犻櫎澶辫触");
+ }
if (userMapper.deleteById(id) > 0) {
return new Response().setMsg(1, "鍒犻櫎鎴愬姛");
} else {
--
Gitblit v1.9.1