changes

liuhaonan

2022-10-14 0957c5458a9ade15c7a59ebc3dd8260bdbd6b26e

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java

@@ -260,8 +260,20 @@
                        pole.setUserId(-1L);
                    }
            );
            //删除

            //删除用户后需要自动解绑该用户的设备

            //灯杆id集合
            List<Long> collect = poles.stream().map(p -> p.getId()).collect(Collectors.toList());
            List<Long> collect1 = poles.stream().map(Pole::getId).collect(Collectors.toList());
            //删除绑定关系
            SpringContextHolder.getBean(PoleBindingService.class)
                    .remove(Wrappers.lambdaQuery(PoleBinding.class)
                            .in(PoleBinding::getPoleId, collect));
            //更改灯杆归属
            flag = SpringContextHolder.getBean(PoleService.class).updateBatchById(poles);


            //删除失败回滚数据
            if (!flag) {
                throw new BusinessException("删除用户失败！");

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java

@@ -56,8 +56,8 @@
            throw new BusinessException("当前用户没有角色");
        }
        List<Long> roleIdList = roles.stream().map(Role::getId).collect(Collectors.toList());
        List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId))
                .stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());
        List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList)
                        .select(RoleMenuRelation::getMenuId)).stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList());

        Set<String> menuPermissions = new HashSet<>();
        // 菜单权限