Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-08-17 73d5561cbf2bea50acc22f91050fcc3557d49de4

 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
@@ -847,6 +850,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) {
                                    //非自主注册的 返回信息带密码