From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 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 132cce1..3513273 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,61 @@
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());
+ //1表示调用老系统接口，2表示调用新系统接口，3表示不执行接口调用
+ byte state=0;
+ if(doctorUserAllVo.getDepScreen()==null&&doctorUserAllVo.getDepNewScreenclient()==null){
+ state=1;
+ }
+ if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==0){
+ state=3;
+ }
+ if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==1){
+ if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==1){
+ state=2;
+ }
+ if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==0){
+ state=1;
+ }
+ }
+ doctorUserAllVo.setInterfaceState(state);
+ loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
+// 1、is_screen为空时，is_new_screenclient必须为空；
+// 2、is_screen不为空时，is_new_screenclient可为空，可不为空；
+// 3、当两个都为空时，默认调用老系统的接口；
+// 4、当is_screen为false时，不论is_new_screenclient是什么不需要调用任何接口；
+// 5、当is_screen为true时，is_new_screenclient为false或空时，调用老系统的接口；
+// 6、当is_screen为true时，is_new_screenclient为true时，调用新系统的接口；
+
+
}
- log.error("99999");
}
return loginAppUser;
}
@@ -709,6 +730,7 @@
sysOrganizationH.setCreateUserId(createUserId);
sysOrganizationH.setCreateUserName(createUserName);
if (organizationService.save(sysOrganizationH)) {
+ organizationHos=sysOrganizationH.getId();
//写科室组织数据
SysOrganization sysOrganizationD = new SysOrganization();
sysOrganizationD.setOrgLevel(2);
@@ -718,6 +740,7 @@
sysOrganizationD.setCreateUserId(createUserId);
sysOrganizationD.setCreateUserName(createUserName);
if (organizationService.save(sysOrganizationD)) {
+ organizationDep=sysOrganizationD.getId();
//写医院组织数据
SysHospital sysHospital = new SysHospital();
sysHospital.setHospitalName(userRegVo.getHospitalName());
@@ -801,7 +824,11 @@
sysUser.setType(UserType.DOCTOR.name());
}
sysUser.setHAdminUser(false);
- sysUser.setDefaultAuth(false);
+ if(isReg){
+ sysUser.setDefaultAuth(false);
+ }else{
+ sysUser.setDefaultAuth(true);
+ }
sysUser.setOpenId(userRegVo.getOpenId());
sysUser.setDel(false);
sysUser.setTenantId(CommonConstant.H_TENANT);
@@ -857,6 +884,10 @@
if (dicBool) {
//写用户组织关系表
+ SysHospital byId = hospitalService.getById(userRegVo.getHospitalId());
+ if(byId!=null){
+ organizationHos=byId.getOrgId();
+ }
List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>();
sysUserOrgH.setUserId(sysUser.getId());
sysUserOrgH.setOrgId(organizationHos);
@@ -865,7 +896,10 @@
sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId());
sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
sysUserOrgList.add(sysUserOrgH);
-
+ SysDepartment department = departmentService.getById(userRegVo.getDepartmentId());
+ if(department!=null){
+ organizationDep=department.getOrgId();
+ }
sysUserOrgD.setUserId(sysUser.getId());
sysUserOrgD.setOrgId(organizationDep);
sysUserOrgD.setFromId(userRegVo.getDepartmentId());
--
Gitblit v1.8.0