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/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 3143265..d78ce5d 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
@@ -112,22 +112,25 @@
/**
* 获取登录用户的一系列信息 hrj 06-04修改
*
- * @param sysUserNew
+ * @param sysUser
* @return
*/
@Override
- public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
+ public LoginAppUser getLoginAppUser(SysUser sysUser) {
LoginAppUser loginAppUser = new LoginAppUser();
- SysUser sysUser = this.baseMapper.selectById(sysUserNew);
+ SysUser sysUserNew = this.baseMapper.selectById(sysUser);
if (sysUser != null) {
+ //返回的数据为什么要把密码也返回？清空!!
+ loginAppUser.setPassword("");
+ loginAppUser.setNewPassword("");
+ loginAppUser.setOldPassword("");
+
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
- loginAppUser.setDefaultAuth(sysUser.getDefaultAuth());
+ loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
//设置组织机构集合
- if (sysOrganizations != null) {
- loginAppUser.setOrganizations(sysOrganizations);
- }
+ loginAppUser.setOrganizations(sysOrganizations);
List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
// 设置角色
loginAppUser.setRoles(sysRoles);
@@ -142,17 +145,16 @@
loginAppUser.setPermissions(permissions);
}
}
+ //是否医院管理员
+ com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId());
+ if (sysDoctor.getIsAdminUser() != null) {
+ loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser());
+ }
//医院信息 只有H端要返回的信息
if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) {
DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
- //是否医院管理员
- loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
}
- //返回的数据为什么要把密码也返回？清空!!
- loginAppUser.setPassword("");
- loginAppUser.setNewPassword("");
- loginAppUser.setOldPassword("");
}
return loginAppUser;
}
--
Gitblit v1.8.0