From 970fa55a3f883a70faf2faf1504c266dc1cddb0c Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Sat, 04 Jul 2020 15:36:25 +0800
Subject: [PATCH] 二维码去白边

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
index 6b49ba5..b8120c3 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -102,7 +102,7 @@
     <select id="findDoctorUserAllData" parameterType="long" resultType="com.kidgrow.common.model.DoctorUserAll">
 		SELECT sysuser.id,
 		sysdoctor.doctor_name,
-		sysdoctor.doctor_id,
+		sysdoctor.id doctor_Id,
 		sysdoctor.doctor_ccie,
 		sysdoctor.doctor_tel,
 		sysdoctor.doctor_rank,
@@ -162,11 +162,15 @@
         dc.doctor_state,
         us.mobile,
         us.username,
-        us.is_default_auth,
-        us.enabled
+        us.default_auth,
+        us.enabled,
+		roleuser.role_id
         FROM
         sys_doctor dc
         LEFT JOIN sys_user us ON dc.user_id = us.id
-        where dc.is_del=0 and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId}
+        LEFT JOIN sys_role_user roleuser
+        ON roleuser.user_id=us.id
+        where  dc.is_del=0 and dc.enabled=1 and dc.hospital_id=1 and dc.department_id=1 and us.enabled=1
+        and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId}  and (role_id=#{roleId1} or role_id=#{roleId2})
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0