#

vincentlu

11 小时以前 3b8bd7dbba101f4207a08bf0254a9e58bc708348

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/UserServiceImpl.java

@@ -27,7 +27,7 @@

    @Override
    public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
        return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.pickOutMap(true)), pageParam.getTotal());
        return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.checkoutMap()), pageParam.getTotal());
    }

    @Override
@@ -63,4 +63,13 @@
        return password == null ? null : bCryptPasswordEncoder.encode(password);
    }

    @Override
    public User setUserAuthInfo(User user) {
        if (user != null) {
            user.setRoles(userRoleService.listByUserId(user.getId()));
            user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
        }
        return user;
    }

}