From a5aa25a7ae47c57c384964a30e6fd54e0d3d71b8 Mon Sep 17 00:00:00 2001
From: mzh820631607 <mzh820631607@163.com>
Date: Fri, 25 Sep 2020 19:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/msdw/tms/entity/vo/UserEntityVo.java     |  9 +++++++++
 src/main/resources/mapper/tms/UserDao.xml             | 11 +++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java b/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java
index 6b26c4a..1b4831f 100644
--- a/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java
+++ b/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java
@@ -37,5 +37,14 @@ public class UserEntityVo extends UserEntity implements Serializable {
     private List<UserEntity> user;
     //新密码
     private String newPassword;
+    //个人档案省份
+    private String personalProvinceName;
+    //个人档案城市
+    private String personalCityName;
+    //个人档案个人职业ID
+    private Integer personalCareerId;
+    //个人档案学校名称
+    private String professionalSchoolName;
+
 
 }
diff --git a/src/main/resources/mapper/tms/UserDao.xml b/src/main/resources/mapper/tms/UserDao.xml
index b75108c..ae30c52 100644
--- a/src/main/resources/mapper/tms/UserDao.xml
+++ b/src/main/resources/mapper/tms/UserDao.xml
@@ -8,6 +8,9 @@
 	        u.userId,
 	        userName,
 	        u.sex,
+	        u.email,
+	        u.phone,
+	        u.account,
 	        u.countries,
 	        c.cityName,
 	        u.dateBirth,
@@ -16,14 +19,14 @@
 	        u.documentType,
 	        u.educationDegree,
 	        pro.provinceName,
-	        s.schoolName AS userSchoolName,
-	        per.schoolName,
+	        s.schoolName,
+	        per.SchoolName AS professionalSchoolName,
 	        per.disciplineName,
 	        per.professionalClassName,
 	        per.professionalName,
 	        per.personalCareerId,
-	        c.cityName AS personalCityName,
-	        pro.provinceName AS personalProvinceName
+	        s.cityName AS personalCityName,
+	        s.provinceName AS personalProvinceName
         FROM
 	        hr_user_info u,
 	        hr_personal_file per,