From 65ef6085f8603ba7d6e653e361b5200c4f78488c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 28 Oct 2020 09:45:47 +0800
Subject: [PATCH] 将通过openid 登录的接口打通
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 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 132cce1..996495c 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
@@ -107,7 +107,11 @@
@Override
public LoginAppUser findByOpenId(String username) {
SysUser sysUser = this.selectByOpenId(username);
- return getLoginAppUser(sysUser);
+ if (sysUser == null) {
+ return null;
+ } else {
+ return getLoginAppUser(sysUser);
+ }
}
@Override
@@ -127,44 +131,35 @@
log.error(sysUserNew.toString());
LoginAppUser loginAppUser = new LoginAppUser();
SysUser sysUser = this.baseMapper.selectById(sysUserNew);
- log.error("11111");
if (sysUser != null) {
- log.error("22222");
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
loginAppUser.setDefaultAuth(sysUser.getDefaultAuth());
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
//设置组织机构集合
if (sysOrganizations != null) {
- log.error("33333");
loginAppUser.setOrganizations(sysOrganizations);
}
List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
// 设置角色
loginAppUser.setRoles(sysRoles);
- log.error("444444");
if (!CollectionUtils.isEmpty(sysRoles)) {
- log.error("55555");
Set<Long> roleIds = sysRoles.parallelStream().map(SuperEntity::getId).collect(Collectors.toSet());
List<SysMenu> menus = roleMenuMapper.findMenusByRoleIds(roleIds, CommonConstant.PERMISSION);
if (!CollectionUtils.isEmpty(menus)) {
- log.error("66666");
Set<String> permissions = menus.parallelStream().map(p -> p.getPath())
.collect(Collectors.toSet());
// 设置权限集合
loginAppUser.setPermissions(permissions);
}
}
- log.error("777777");
//医院信息
DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
if (doctorUserAllVo != null) {
- log.error("88888");
loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
//是否医院管理员
loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
}
- log.error("99999");
}
return loginAppUser;
}
--
Gitblit v1.8.0