diff --git a/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java b/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java index 7a6a352..d198c5e 100644 --- a/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java +++ b/src/main/java/com/dc/dc_project/model/vo/UserInfoVo.java @@ -1,5 +1,6 @@ package com.dc.dc_project.model.vo; +import com.dc.dc_project.model.pojo.Personnel; import com.dc.dc_project.model.pojo.Role; import lombok.AllArgsConstructor; import lombok.Data; @@ -31,4 +32,17 @@ public class UserInfoVo { private List roles; private List positionVos; + + public static UserInfoVo personnelToUserInfoVo(Personnel personnel) { + UserInfoVo userInfoVo = new UserInfoVo(); + userInfoVo.setUserId(personnel.getUserId()); + userInfoVo.setPersonId(personnel.getId()); + userInfoVo.setUsername(personnel.getName()); + userInfoVo.setAvatar(personnel.getAvatar()); + userInfoVo.setPhone(personnel.getContactPhone()); + userInfoVo.setEmail(personnel.getEmail()); + userInfoVo.setMainResponsibility(personnel.getMainResponsibility()); + userInfoVo.setRemark(personnel.getRemark()); + return userInfoVo; + } } diff --git a/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java b/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java index 2a6bb22..6d6aa02 100644 --- a/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java +++ b/src/main/java/com/dc/dc_project/service/impl/UserServiceImpl.java @@ -103,7 +103,9 @@ public class UserServiceImpl extends ServiceImpl List roles = roleMapper.getRolesByUserId(user.getId()); List positions = positionMapper.getPositionsByPId(personnel.getId()); - UserInfoVo userInfoVo = new UserInfoVo(); + UserInfoVo userInfoVo = UserInfoVo.personnelToUserInfoVo(personnel); + userInfoVo.setRoles(roles); + userInfoVo.setPositionVos(positions); return ResponseResult.success(userInfoVo); diff --git a/src/main/resources/mapper/PositionMapper.xml b/src/main/resources/mapper/PositionMapper.xml index f408459..5150dee 100644 --- a/src/main/resources/mapper/PositionMapper.xml +++ b/src/main/resources/mapper/PositionMapper.xml @@ -20,9 +20,19 @@