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 | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 9b95c0b..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
@@ -124,6 +128,7 @@
*/
@Override
public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
+ log.error(sysUserNew.toString());
LoginAppUser loginAppUser = new LoginAppUser();
SysUser sysUser = this.baseMapper.selectById(sysUserNew);
if (sysUser != null) {
@@ -138,7 +143,6 @@
List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
// 设置角色
loginAppUser.setRoles(sysRoles);
-
if (!CollectionUtils.isEmpty(sysRoles)) {
Set<Long> roleIds = sysRoles.parallelStream().map(SuperEntity::getId).collect(Collectors.toSet());
List<SysMenu> menus = roleMenuMapper.findMenusByRoleIds(roleIds, CommonConstant.PERMISSION);
@@ -149,7 +153,6 @@
loginAppUser.setPermissions(permissions);
}
}
-
//医院信息
DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
if (doctorUserAllVo != null) {
@@ -326,15 +329,13 @@
Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
List<SysUser> list = baseMapper.findList(page, params);
long total = page.getTotal();
- if (total > 0) {
+ if (total > 0&&list.size()>0) {
List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
-
- List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
-
-// Map<String, Object> map = new HashMap<String, Object>();
-// List<SysOrganization> sysOrganizationList=organizationService.fin();
- list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
- .collect(Collectors.toList())));
+ if (userIds.size()>0) {
+ List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
+ list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
+ .collect(Collectors.toList())));
+ }
}
return PageResult.<SysUser>builder().data(list).code(0).count(total).build();
}
@@ -835,7 +836,11 @@
//创建字典数据
sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK);
//将名称汉字转为拼音
- sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)));
+ String keyStr=Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true));
+ if (keyStr.length()>50) {
+ keyStr=keyStr.substring(0,49);
+ }
+ sysDictionaries.setDictionariesKey(keyStr);
sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
sysDictionaries.setCreateUserId(createUserId);
sysDictionaries.setCreateUserName(createUserName);
--
Gitblit v1.8.0