Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

liyanqi

2022-10-27 509b52219b44cbbf16c3b364da566ed00f8aabbe

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -133,34 +133,38 @@
        }
        //绑定菜单于用户
        if (!ids.isEmpty()) {
            Integer size = 0;
            Long maxId = null;
            ArrayList<UmsRoleMenuRelation> umsRoleMenuRelations = new ArrayList<>();
            for (Long id : ids) {
                if (size < umsRoleMenuRelationMapper
                umsRoleMenuRelations.addAll(umsRoleMenuRelationMapper
                        .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                                .eq(UmsRoleMenuRelation::getRoleId, id)).size()) {
                    size = umsRoleMenuRelationMapper
                            .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                                    .eq(UmsRoleMenuRelation::getRoleId, id)).size();
                    maxId = id;
                }
                                .eq(UmsRoleMenuRelation::getRoleId, id)));
            }
            umsRoleMenuRelationMapper
                    .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                            .eq(UmsRoleMenuRelation::getRoleId, maxId))
            umsRoleMenuRelations
                    .stream()
                    .map(item->item.getMenuId())
                    .collect(Collectors.toList())
                    .stream()
                    .distinct()
                    .collect(Collectors.toList())
                    .stream()
                    .forEach(item -> {
                        AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
                        adminMenuRelation.setAdminId(umsAdmin.getId());
                        adminMenuRelation.setMenuId(item.getMenuId());
                        adminMenuRelation.setSort(umsMenuMapper.selectOne(new LambdaQueryWrapper<UmsMenu>().eq(UmsMenu::getId, item.getMenuId())).getSort());
                        adminMenuRelation.setMenuId(item);
                        adminMenuRelationMapper.insert(adminMenuRelation);
                    });
        }
        //对用户名系统默认添加
        //umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
        baseMapper.updateById(umsAdmin);
        //添加部门
        UmsDepartManage departManage = new UmsDepartManage();
        departManage.setUserId(umsAdmin.getId());
        departManage.setDepartId(umsAdmin.getDepartmentId());
        departManage.setCreateTime(new Date());
        departManage.setUpdateTime(new Date());
        umsDepartManageMapper.insert(departManage);

        baseMapper.updateById(umsAdmin);
        return umsAdmin;
    }

@@ -291,16 +295,14 @@
    }

    @Override
    public List<UmsResource> getResourceList(Long adminId) {
        List<UmsResource> resourceList = getCacheService().getResourceList(adminId);
        if (CollUtil.isNotEmpty(resourceList)) {
            return resourceList;
    public List<UmsMenu> getResourceList(Long adminId) {
        List<UmsMenu> umsMenuList = getCacheService().getResourceList(adminId);
        if (CollUtil.isNotEmpty(umsMenuList)) {
            return umsMenuList;
        }
        resourceList = umsResourceMapper.getResourceList(adminId);
        if (CollUtil.isNotEmpty(resourceList)) {
            getCacheService().setResourceList(adminId, resourceList);
        }
        return resourceList;
        umsMenuList = umsMenuMapper.getMenuList(adminId);
            getCacheService().setResourceList(adminId, umsMenuList);
        return umsMenuList;
    }

    @Override
@@ -331,7 +333,7 @@
        //获取用户信息
        UmsAdmin admin = getAdminByUsername(username);
        if (admin != null) {
            List<UmsResource> resourceList = getResourceList(admin.getId());
            List<UmsMenu> resourceList = getResourceList(admin.getId());
            return new AdminUserDetails(admin, resourceList);
        }
        throw new UsernameNotFoundException("用户名或密码错误");