tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 合并冲突解决

Browse Source
This commit is contained in:
Ray.Hao
2025-03-31 08:21:58 +08:00
parent 60cfa78a52 354b9f3c49
commit 04fba012b5
7 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/youlai/boot/system/service/UserService.java
View File

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.core.security.model.AuthCredentials;
import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.query.UserPageQuery;
import com.youlai.boot.system.model.vo.UserInfoVO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.model.form.*;
@@ -87,9 +87,9 @@ public interface UserService extends IService<User> {
/**
* 获取登录用户信息
*
* @return {@link UserInfoVO} 登录用户信息
* @return {@link CurrentUserDTO} 登录用户信息
*/
UserInfoVO getCurrentUserInfo();
CurrentUserDTO getCurrentUserInfo();
/**
* 获取个人中心用户信息

10
src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java
View File

@@ -23,13 +23,13 @@ import com.youlai.boot.system.enums.DictCodeEnum;
import com.youlai.boot.system.mapper.UserMapper;
import com.youlai.boot.system.model.bo.UserBO;
import com.youlai.boot.core.security.model.AuthCredentials;
import com.youlai.boot.system.model.dto.CurrentUserDTO;
import com.youlai.boot.system.model.dto.UserExportDTO;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.entity.UserRole;
import com.youlai.boot.system.model.form.*;
import com.youlai.boot.system.model.query.UserPageQuery;
import com.youlai.boot.system.model.vo.UserInfoVO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
import com.youlai.boot.system.service.*;
@@ -314,10 +314,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
/**
* 获取登录用户信息
*
* @return {@link UserInfoVO} 用户信息
* @return {@link CurrentUserDTO} 用户信息
*/
@Override
public UserInfoVO getCurrentUserInfo() {
public CurrentUserDTO getCurrentUserInfo() {
String username = SecurityUtils.getUsername();
@@ -332,7 +332,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
)
);
// entity->VO
UserInfoVO userInfoVO = userConverter.toUserInfoVo(user);
CurrentUserDTO userInfoVO = userConverter.toCurrentUserDto(user);
// 用户角色集合
Set<String> roles = SecurityUtils.getRoles();
@@ -355,7 +355,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
@Override
public UserProfileVO getUserProfile(Long userId) {
UserBO entity = this.baseMapper.getUserProfile(userId);
return userConverter.toProfileVO(entity);
return userConverter.toProfileVo(entity);
}
/**