20220606

xiaoyong931011

2022-06-15 6c82b0f944a0d3547659db5ec1f640a9ec7d3fd3

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java

@@ -251,6 +251,14 @@
        List<UserRoleEntity> userRoleEntities = userRoleMapper.selectList(userRoleQueryWrapper);
        if(CollUtil.isNotEmpty(userRoleEntities)){
            List menuIds = new ArrayList<Long>();
            if(UserEntity.USERNAME_DEFAULT.equals(loginUser.getUsername())){
                List<MenuEntity> menuEntities = menuMapper.selectList(new QueryWrapper<>());
                if(CollUtil.isNotEmpty(menuEntities)){
                    for(MenuEntity menuEntity : menuEntities){
                        menuIds.add(menuEntity.getId());
                    }
                }
            }else{
            for(UserRoleEntity userRoleEntity : userRoleEntities){
                List<RoleMenuEntity> roleMenuEntities = roleMenuMapper.selectListByRoleId(userRoleEntity.getRoleId());
                if(CollUtil.isNotEmpty(roleMenuEntities)){
@@ -259,6 +267,7 @@
                    }
                }
            }
            }
            if(CollUtil.isNotEmpty(menuIds)){
                HashSet hashSet = CollUtil.newHashSet(menuIds);
                List<Long> parentMenuIds = new ArrayList<>();