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 | 10 ++--------
1 files changed, 2 insertions(+), 8 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 672c6b0..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
@@ -622,8 +622,6 @@
sysOrganizationHos.setOrgAttr(1);
sysOrganizationHos.setOrgLevel(1);
sysOrganizationHos.setOrgName(userRegVo.getHospitalName());
- sysOrganizationHos.setCreateUserId(0l);
- sysOrganizationHos.setCreateUserName("自主注册");
sysOrganizationList.add(sysOrganizationHos);
//添加科室组织数据
@@ -631,8 +629,6 @@
sysOrganizationDe.setOrgAttr(2);
sysOrganizationDe.setOrgLevel(2);
sysOrganizationDe.setOrgName(userRegVo.getDepartmentName());
- sysOrganizationDe.setCreateUserId(0L);
- sysOrganizationDe.setCreateUserName("自主注册");
sysOrganizationList.add(sysOrganizationDe);
//批量写入
boolean orgRe= organizationService.saveBatch(sysOrganizationList);
@@ -658,8 +654,7 @@
sysDepartment.setSaleUserName("自主注册");
sysDepartment.setSaleUserTel("0");
sysDepartment.setServerUserId(0L);
- sysDepartment.setServerUserTel("0");//serverUserName
- sysDepartment.setServerUserName("自主注册");
+ sysDepartment.setServerUserTel("0");
boolean d=departmentService.save(sysDepartment);
if (!d) {
return ResultBody.failed("科室数据写入失败");
@@ -760,8 +755,7 @@
sysDoctor.setServerUserName("自主注册");
if (sysDoctorMapper.insert(sysDoctor)==1) {
sysUser.setPassword(userRegVo.getPassword());
- return ResultBody.ok().data(sysUser);
-// return ResultBody.ok(200,"注册成功").data(sysUser);
+ return ResultBody.ok(200,"注册成功").data(sysUser);
}
else
{
--
Gitblit v1.8.0