From bf5d9213a282f787e86f541993c18290645d590e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 22 Jun 2020 17:51:59 +0800
Subject: [PATCH] 1.修改用户注册字段默认值 2.给用户信息中增加医生id 3.数据需求增加其他字段 4。全局排除文件上传的token验证

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 454522a..f67c7b7 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
@@ -722,11 +722,9 @@
         if (StringUtils.isBlank(userRegVo.getPassword())) {
             defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
             sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
-            sysUser.setDefaultAuth(false);
             userRegVo.setPassword(defaultPassWord);
         } else {
             sysUser.setPassword(passwordEncoder.encode(userRegVo.getPassword()));
-            sysUser.setDefaultAuth(false);
         }
         sysUser.setNickname(userRegVo.getNickname());
         sysUser.setSex(userRegVo.getSex());
@@ -737,6 +735,7 @@
             sysUser.setType(UserType.DOCTOR.name());
         }
         sysUser.setHAdminUser(false);
+        sysUser.setDefaultAuth(false);
         sysUser.setOpenId(userRegVo.getOpenId());
         sysUser.setDel(false);
         sysUser.setTenantId("hospital");
@@ -811,7 +810,13 @@
                                 sysDoctor.setDoctorRankId(userRegVo.getDoctorRankId());
                                 sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId());
                                 sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
-                                sysDoctor.setDoctorState(userRegVo.getDoctorState());
+                                if (isReg) {
+                                    sysDoctor.setDoctorState(false);
+                                }
+                                else
+                                {
+                                    sysDoctor.setDoctorState(true);
+                                }
                                 sysDoctor.setDoctorTel(userRegVo.getMobile());
                                 sysDoctor.setDoctorName(userRegVo.getNickname());
                                 sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());

--
Gitblit v1.8.0