From 657cbb444b299c151de719404698d76d0fe24fe3 Mon Sep 17 00:00:00 2001
From: mzh820631607 <mzh820631607@163.com>
Date: Mon, 28 Sep 2020 10:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/msdw/tms/entity/vo/UserEntityVo.java     |  2 --
 src/main/resources/mapper/tms/UserDao.xml        | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 7 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 3f2f1a2..c6a7e0d 100644
--- a/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java
+++ b/src/main/java/com/msdw/tms/entity/vo/UserEntityVo.java
@@ -49,8 +49,6 @@ public class UserEntityVo extends UserEntity implements Serializable {
     private String professionalSchoolName;
     //个人档案主键
     private Integer personalFileId;
-    //绑定用户ID
-    private Integer userId;
 
 
 }
diff --git a/src/main/resources/mapper/tms/UserDao.xml b/src/main/resources/mapper/tms/UserDao.xml
index e1436fb..01a0fbe 100644
--- a/src/main/resources/mapper/tms/UserDao.xml
+++ b/src/main/resources/mapper/tms/UserDao.xml
@@ -13,13 +13,16 @@
 	        u.phone,
 	        u.account,
 	        u.countries,
+	        c.cityId,
 	        c.cityName,
 	        u.dateBirth,
 	        u.weChatID,
 	        u.IDNumber,
 	        u.documentType,
 	        u.educationDegree,
+	        pro.provinceId,
 	        pro.provinceName,
+	        s.schoolId,
 	        s.schoolName
         FROM
 	        hr_user_info u,
@@ -40,8 +43,9 @@
 
 	<select id="queryPersonalFile" parameterType="com.msdw.tms.entity.UserEntity" resultType="com.msdw.tms.entity.vo.UserEntityVo">
 		SELECT
-			per.schoolId AS personalSchoolId,
-	        per.SchoolName AS personalSchoolName,
+			per.personalFileId,
+			per.schoolId,
+	        per.schoolName,
 			disciplineId,
 	        disciplineName,
 			professionalClassId,
@@ -49,8 +53,10 @@
 			per.professionalId,
 	        per.professionalName,
 	        per.personalCareerId,
-	        s.cityName AS personalCityName,
-	        s.provinceName AS personalProvinceName
+	        s.cityId,
+	        s.cityName,
+	        s.provinceId,
+	        s.provinceName
         FROM
 	        hr_personal_file per,
 	        school s
@@ -75,7 +81,7 @@
 			per.professionalClassName = #{professionalClassName},
 			per.updatetime = NOW()
 		WHERE
-			per.userId = #{userId}
+			per.userId = #{userid}
 		AND
 			per.personalFileId = #{personalFileId}