From cb49a28e3ea5cfac3910f6c237f40bcebd962397 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 10 Jul 2020 13:56:47 +0800
Subject: [PATCH] 租户设置中将动态表设置分离
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 2764b90..9724248 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
@@ -113,6 +113,7 @@
@Override
public LoginAppUser getLoginAppUser(SysUser sysUser) {
LoginAppUser loginAppUser = new LoginAppUser();
+ SysUser sysUserNew = this.baseMapper.selectById(sysUser);
if (sysUser != null) {
//返回的数据为什么要把密码也返回？清空!!
loginAppUser.setPassword("");
@@ -121,6 +122,7 @@
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
+ loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
//设置组织机构集合
loginAppUser.setOrganizations(sysOrganizations);
@@ -240,6 +242,8 @@
user.setPassword(passwordEncoder.encode(newPassword));
if (isdefault) {
user.setDefaultAuth(true);
+ }else {
+ user.setDefaultAuth(false);
}
baseMapper.updateById(user);
if (isdefault) {
@@ -936,6 +940,7 @@
public boolean phoneIsUsed(String phone) {
Map<String, Object> selectMap = new HashMap<>();
selectMap.put("mobile", phone);
+ selectMap.put("is_del", 0);
List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
return (sysUsers.size() > 0);
}
@@ -946,17 +951,14 @@
* @param depatmentId
* @return
*/
- private Integer departmetAccountsCount(Long depatmentId) {
+ public Integer departmetAccountsCount(Long depatmentId) {
SysDepartment sysDepartment = departmentService.getById(depatmentId);
if (sysDepartment == null) {
return 0;
} else {
- Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("department_id", depatmentId);
- selectMap.put("enabled", 1);
- List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
- if (sysDoctorList != null) {
- int doctorCount = sysDoctorList.size();
+ List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysDepartment.getHospitalId(), depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
+ if (hospitalDoctorListVos != null) {
+ int doctorCount = hospitalDoctorListVos.size();
int accountCount = sysDepartment.getAccountsCount();
return (accountCount - doctorCount);
} else {
@@ -964,6 +966,24 @@
}
}
}
+// private Integer departmetAccountsCount(Long depatmentId) {
+// SysDepartment sysDepartment = departmentService.getById(depatmentId);
+// if (sysDepartment == null) {
+// return 0;
+// } else {
+// Map<String, Object> selectMap = new HashMap<>();
+// selectMap.put("department_id", depatmentId);
+// selectMap.put("enabled", 1);
+// List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
+// if (sysDoctorList != null) {
+// int doctorCount = sysDoctorList.size();
+// int accountCount = sysDepartment.getAccountsCount();
+// return (accountCount - doctorCount);
+// } else {
+// return 0;
+// }
+// }
+// }
/**
* 检查用户登录名是否已经注册 true存在 false不存在
--
Gitblit v1.8.0