From 0a2e9f43f957e149d6234bf9dbe72d26bcc418bf Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 14 Aug 2020 15:51:40 +0800
Subject: [PATCH] 回滚

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 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 b8120c3..6cefc57 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
@@ -164,13 +164,40 @@
         us.username,
         us.default_auth,
         us.enabled,
-		roleuser.role_id
+		roleuser.role_id,
+		dc.is_del
         FROM
         sys_doctor dc
         LEFT JOIN sys_user us ON dc.user_id = us.id
         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
+        where  dc.is_del=0 and dc.enabled=1  and us.enabled=1
+        and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId}  and (role_id=#{roleId1} or role_id=#{roleId2})
+    </select>
+    <select id="hospitalDoctorListAndDel" parameterType="long" resultType="com.kidgrow.usercenter.vo.HospitalDoctorListVo">
+        SELECT
+        dc.create_time,
+        dc.department_name,
+        dc.hospital_name,
+        dc.doctor_name,
+        dc.doctor_rank,
+        dc.doctor_tel,
+        dc.id,
+        dc.user_id,
+        dc.is_admin_user,
+        dc.doctor_state,
+        us.mobile,
+        us.username,
+        us.default_auth,
+        us.enabled,
+		roleuser.role_id,
+		dc.is_del
+        FROM
+        sys_doctor dc
+        LEFT JOIN sys_user us ON dc.user_id = us.id
+        LEFT JOIN sys_role_user roleuser
+        ON roleuser.user_id=us.id
+        where   dc.enabled=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