liyanqi
2022-10-27 509b52219b44cbbf16c3b364da566ed00f8aabbe
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -295,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
@@ -335,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("用户名或密码错误");