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

zhaoxiaohao

2020-06-16 bdc56ebc9534620766d787a1dacb4c962ea10797

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -275,6 +275,7 @@
                                SysUser user = new SysUser();
                                user.setId(id);
                                user.setMobile(newTel);
                                user.setUsername(newTel);
                                //修改doctor表
                                com.kidgrow.usercenter.model.SysDoctor sysDoctorModel= findDoctorByUserId(user.getId());
                                com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel= new com.kidgrow.usercenter.model.SysDoctor();
@@ -284,8 +285,9 @@
                                    newsysDoctorModel.setDoctorTel(newTel);
                                    sysDoctorMapper.updateById(newsysDoctorModel);
                                }

                                if (baseMapper.updateById(user) > 0) {
                                    //将Redis清除
                                    redisUtils.hdel(ConstantSMS.PHONE_SMS,newTel);
                                    return ResultBody.ok().msg("手机号修改成功！");
                                } else {
                                    return ResultBody.failed("手机号修改失败！");
@@ -536,6 +538,9 @@
        if (StringUtils.isBlank(phone)) {
            return ResultBody.failed("请输入新手机号");
        }
        if(!sysUser.getMobile().equals(password)){
            return ResultBody.failed("请输入原手机号");
        }
        String verificationCode = MapUtils.getString(map, "verificationCode");
        if (StringUtils.isBlank(verificationCode)) {
            return ResultBody.failed("请输入验证码");
@@ -609,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>();
@@ -697,6 +702,7 @@
        sysUser.setHAdminUser(false);
        sysUser.setOpenId(userRegVo.getOpenId());
        sysUser.setDel(false);
        sysUser.setTenantId("hospital");
        boolean u=this.save(sysUser);
        if(u)
        {
@@ -721,7 +727,7 @@
                    sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
                    sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK_ID.toString());
                    //将名称汉字转为拼音
                    sysDictionaries.setDictionariesKey("");
                    sysDictionaries.setDictionariesKey("temp");
                    sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
                    sysDictionaries.setCreateUserId(0L);
                    sysDictionaries.setCreateUserName("自动创建");