From bdc56ebc9534620766d787a1dacb4c962ea10797 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:36:35 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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 4e32911..5dc3489 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
@@ -614,7 +614,7 @@
             return ResultBody.failed("该手机号已经注册");
         }
         //检查判断是注册 还是添加用户,注册用户先走基本数据建设
-        if (StringUtils.isBlank(userRegVo.getHospitalId().toString())) {
+        if (userRegVo.getHospitalId()==null) {
             userRegVo.setDoctorState(true);
             //添加医院组织结构数据
             List<SysOrganization> sysOrganizationList=new ArrayList<SysOrganization>();
@@ -702,6 +702,7 @@
         sysUser.setHAdminUser(false);
         sysUser.setOpenId(userRegVo.getOpenId());
         sysUser.setDel(false);
+        sysUser.setTenantId("hospital");
         boolean u=this.save(sysUser);
         if(u)
         {

--
Gitblit v1.8.0