From c1b942ccf2ee1ab5d01ae590d6a16ce14d0cf54b Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Mar 2021 19:21:45 +0800
Subject: [PATCH] 1、增加私有云客户创建时的标识位和服务器Guuid 2、增加私有云服务器License下载 3、增加私有云数据库下载
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 3dc3726..d9697f0 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
@@ -156,7 +156,6 @@
//医院信息
DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
if (doctorUserAllVo != null) {
-
//是否医院管理员
loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
//1表示调用老系统接口，2表示调用新系统接口，3表示不执行接口调用
@@ -164,14 +163,14 @@
if(doctorUserAllVo.getDepScreen()==null&&doctorUserAllVo.getDepNewScreenclient()==null){
state=1;
}
- if(doctorUserAllVo.getDepScreen().equals(0)){
+ if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==0){
state=3;
}
- if(doctorUserAllVo.getDepScreen().equals(1)){
- if(doctorUserAllVo.getDepNewScreenclient().equals(1)){
+ if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==1){
+ if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==1){
state=2;
}
- if(doctorUserAllVo.getDepNewScreenclient().equals(0)){
+ if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==0){
state=1;
}
}
@@ -824,7 +823,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);
--
Gitblit v1.8.0