From afd096a0b47bcd460e7c1ca9fa00ce42dc380692 Mon Sep 17 00:00:00 2001
From: gongzhenkun <1658878546@qq.com>
Date: Thu, 17 Nov 2022 16:32:16 +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

---
 .../resources/mapper/system/SysUserMapper.xml | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e2079dd..6967774 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -32,8 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="hospitalName"  column="hospital_name"/>
 		<result property="title"  column="title"/>
 		<result property="speciality"  column="speciality"/>
-		<result property="medicalLicense"  column="medicalLicense"/>
-		<result property="medicalLicense2"  column="medicalLicense2"/>
+		<result property="medicalLicense"  column="medical_license"/>
+		<result property="medicalLicense2"  column="medical_license2"/>
 	</resultMap>
 	
     <resultMap id="deptResult" type="SysDept">
@@ -140,9 +140,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="UserExResult">
-		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-			   d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,td.hospital_id,
-			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+		select u.user_id,
+			   u.dept_id,
+			   u.user_name,
+			   u.nick_name,
+			   u.email,
+			   u.avatar,
+			   u.phonenumber,
+			   u.password,
+			   u.sex,
+			   u.status,
+			   u.del_flag,
+			   u.login_ip,
+			   u.login_date,
+			   u.create_by,
+			   u.create_time,
+			   u.remark,
+			   d.dept_id,
+			   d.parent_id,
+			   d.ancestors,
+			   d.dept_name,
+			   d.order_num,
+			   d.leader,
+			   d.status as dept_status,
+			   td.hospital_id,
+			   td.title,
+			   td.speciality,
+			   td.medical_license,
+			   td.medical_license2,
+			   r.role_id,
+			   r.role_name,
+			   r.role_key,
+			   r.role_sort,
+			   r.data_scope,
+			   r.status as role_status
 		from sys_user u
 				 left join sys_dept d on u.dept_id = d.dept_id
 				 left join sys_user_role ur on u.user_id = ur.user_id
@@ -295,6 +326,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
 		</if>
+		<if test="hospitalId != null and hospitalId != 0">
+			AND td.hospital_id = #{hospitalId}
+		</if>
 		ORDER BY u.user_id
 	</select>