From 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 15 Jul 2020 09:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 9724248..1ed685b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -165,7 +165,8 @@
public SysUser selectByUsername(String username) {
String clientId = ClientContextHolder.getClient();
List<SysUser> users = baseMapper.selectList(
- new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id", clientId)
+ //new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id", clientId)
+ new QueryWrapper<SysUser>().eq("username", username)
);
return getUser(users);
}
@@ -922,9 +923,14 @@
* @return
*/
@Override
- public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId) {
+ public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId,Boolean isIncluddel) {
if (hospitalId > 0 && departmentId > 0) {
- List<HospitalDoctorListVo> listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
+ List<HospitalDoctorListVo> listVoList;
+ if(isIncluddel){
+ listVoList= baseMapper.hospitalDoctorListAndDel(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
+ }else {
+ listVoList=baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
+ }
return ResultBody.ok().data(listVoList);
} else {
return ResultBody.failed("医院数据有误");
--
Gitblit v1.8.0