whyczh
2021-06-03 195cdca1fae35cc9d7750ec2446412ef6cfb41fe
用户权限更新superuser
4个文件已修改
35 ■■■■ 已修改文件
src/main/java/com/whyc/service/LoginService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/RoleService.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/UserRoleService.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/UserService.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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{
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{
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);
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 {