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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..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
@@ -164,14 +164,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 +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);
--
Gitblit v1.8.0