From 82ff0f9874014eb3e734815eb978379a9bea38a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 23 Jun 2020 10:11:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 4 ++--
1 files changed, 2 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 a6664dd..5849181 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,6 +102,7 @@
<select id="findDoctorUserAllData" parameterType="long" resultType="com.kidgrow.common.model.DoctorUserAll">
SELECT sysuser.id,
sysdoctor.doctor_name,
+ sysdoctor.id doctor_Id,
sysdoctor.doctor_ccie,
sysdoctor.doctor_tel,
sysdoctor.doctor_rank,
@@ -128,11 +129,9 @@
syshos.hospital_logo,
syshos.is_screen hosisscreen,
syshos.is_answer hosisanswer,
- syshos.accounts_count,
syshos.hospital_state,
syshos.enabled hosenabled,
syshos.is_del hosdel,
- syshos.accounts_count,
sysdep.id department_id,
sysdep.department_name,
@@ -141,6 +140,7 @@
sysdep.sale_user_name,
sysdep.sale_user_tel,
sysdep.enabled depenabled,
+ sysdep.accounts_count,
sysdep.is_del depdel
FROM sys_user sysuser
left JOIN sys_doctor sysdoctor on sysuser.id=sysdoctor.user_id
--
Gitblit v1.8.0