From 340c78a00a9d30dd7157063218136ca990878c73 Mon Sep 17 00:00:00 2001
From: lhx <liy200110@163.com>
Date: Wed, 17 Dec 2025 16:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dc/dc_project/model/vo/UserInfoVo.java | 14 ++++++++++++++
 .../service/impl/UserServiceImpl.java          |  4 +++-
 src/main/resources/mapper/PositionMapper.xml   | 18 ++++++++++++++----
 3 files changed, 31 insertions(+), 5 deletions(-)

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<Role> roles;
 
     private List<PositionVo> 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<UserMapper, User>
         List<Role> roles = roleMapper.getRolesByUserId(user.getId());
         List<PositionVo> 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 @@
     </sql>
     <select id="getPositionsByPId" resultType="com.dc.dc_project.model.vo.PositionVo">
         select
-            id
-        from sys_position
-        left join sys_personnel_position spp on sys_position.id = spp.position_id
-        left join
+            p.id,
+            p.name,
+            p.org_id,
+            p.remark,
+            p.created_at,
+            p.updated_at,
+            p.is_deleted,
+            o.name as org_name
+        from sys_position p
+        left join sys_personnel_position spp on p.id = spp.position_id
+        left join sys_org o on o.id = p.org_id
+        <where>
+            spp.personnel_id = #{id}
+        </where>
     </select>
 </mapper>