From 7e152042fcd97d67957f38a728db8868d9054d7c Mon Sep 17 00:00:00 2001
From: mzh820631607 <mzh820631607@163.com>
Date: Fri, 25 Sep 2020 17:42:58 +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

---
 src/main/resources/mapper/tms/UserDao.xml | 56 +++++++++++++----------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/mapper/tms/UserDao.xml b/src/main/resources/mapper/tms/UserDao.xml
index c12877f..b75108c 100644
--- a/src/main/resources/mapper/tms/UserDao.xml
+++ b/src/main/resources/mapper/tms/UserDao.xml
@@ -5,31 +5,41 @@
 
     <select id="getByUserId" parameterType="com.msdw.tms.entity.UserEntity" resultType="com.msdw.tms.entity.vo.UserEntityVo">
         SELECT
-            userName,
-            sex,
-            countries,
-            p.provinceName as provinceName,
-            c.cityName as cityName,
-            IDNumber,
-            educationDegree,
-            schoolName,
-            account,
-            phone,
-            email,
-            weChatID,
-            'password'
+	        u.userId,
+	        userName,
+	        u.sex,
+	        u.countries,
+	        c.cityName,
+	        u.dateBirth,
+	        u.weChatID,
+	        u.IDNumber,
+	        u.documentType,
+	        u.educationDegree,
+	        pro.provinceName,
+	        s.schoolName AS userSchoolName,
+	        per.schoolName,
+	        per.disciplineName,
+	        per.professionalClassName,
+	        per.professionalName,
+	        per.personalCareerId,
+	        c.cityName AS personalCityName,
+	        pro.provinceName AS personalProvinceName
         FROM
-            hr_user_info u,
-            province p,
-            city c,
-            school s
+	        hr_user_info u,
+	        hr_personal_file per,
+	        school s,
+        	city c,
+        	province pro
         WHERE
-            u.userId = #{userid}
-            AND u.provinceId = p.provinceId
-            AND p.provinceId = c.provinceId
-            AND c.cityId = u.cityId
-            AND u.schoolId = s.schoolId
-            AND p.isdel = #{isdel}
+        	per.schoolId = s.schoolId
+        	AND u.provinceId = pro.provinceId
+        	AND u.schoolId = s.schoolId
+        	AND u.cityId = c.cityId
+        	AND u.isdel = #{isdel}
+        	AND u.provinceId = c.provinceId
+        	AND u.userId = per.userId
+        	AND per.userId = #{userid}
+            AND pro.isdel = #{isdel}
             AND c.isdel = #{isdel}
             AND s.isdel = #{isdel}
     </select>