From dc029e255839c9ae591223bab2cea3bb81040899 Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Thu, 20 Aug 2020 09:38:19 +0800
Subject: [PATCH] 修改   医生为管理员时,不能修改的bug

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 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 9f9d8ee..f874488 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
@@ -59,12 +59,14 @@
     private final static String LOCK_KEY_USERNAME = CommonConstant.LOCK_KEY_PREFIX + "username:";
     @Autowired
     private PasswordEncoder passwordEncoder;
+
     @Resource
     private ISysRoleUserService roleUserService;
     @Resource
     private ISysDictionariesService sysDictionariesService;
     @Resource
     private SysRoleMenuMapper roleMenuMapper;
+
     @Autowired
     private ISysOrganizationService organizationService;
     @Autowired
@@ -81,6 +83,7 @@
     private DistributedLock lock;
     @Autowired
     private SysDoctorMapper sysDoctorMapper;
+
     @Autowired
     private SysRoleMapper sysRoleMapper;
     @Autowired
@@ -94,7 +97,12 @@
     @Override
     public LoginAppUser findByUsername(String username) {
         SysUser sysUser = this.selectByUsername(username);
-        return getLoginAppUser(sysUser);
+        if(sysUser==null){
+            return null;
+        }
+        else {
+            return getLoginAppUser(sysUser);
+        }
     }
 
     @Override
@@ -847,6 +855,7 @@
                                 sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
                                 sysDoctor.setServerUserName(isReg ? createUserName : sysUserd.getUsername());
                                 sysDoctor.setIsAdminUser(false);
+                                sysDoctor.setDoctorCcie(userRegVo.getDoctorCcie());
                                 sysDoctor.setEnabled(true);
                                 if (sysDoctorMapper.insert(sysDoctor) == 1) {
                                     //非自主注册的 返回信息带密码

--
Gitblit v1.8.0