From d485902ae91b906ce542e51936bd460f0a3a5b08 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Tue, 01 Sep 2020 16:46:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 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 fb96ff6..8a1dd0e 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 @@ -272,7 +272,7 @@ String oldTel = MapUtils.getString(params, "oldTel"); String newTel = AesUtils.desEncrypt(MapUtils.getString(params, "newTel")).trim(); String authCode = AesUtils.desEncrypt(MapUtils.getString(params, "authCode")).trim(); - String userPassword = AesUtils.desEncrypt(MapUtils.getString(params, "userPassword")).trim(); + String userPassword =MapUtils.getString(params, "userPassword"); if (id > 0 && StringUtils.isNotBlank(oldTel) && StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) { //检查验证码 @@ -298,8 +298,8 @@ com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel = new com.kidgrow.usercenter.model.SysDoctor(); if (sysDoctorModel != null) { //理论上只有一个,如果有多个 只取第一个 - newsysDoctorModel.setId(sysDoctorModel.getId()); - newsysDoctorModel.setDoctorTel(newTel); + sysDoctorModel.setId(sysDoctorModel.getId()); + sysDoctorModel.setDoctorTel(newTel); sysDoctorMapper.updateById(newsysDoctorModel); } if (baseMapper.updateById(user) > 0) { @@ -835,7 +835,11 @@ //创建字典数据 sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK); //将名称汉字转为拼音 - sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true))); + String keyStr=Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)); + if (keyStr.length()>50) { + keyStr=keyStr.substring(0,49); + } + sysDictionaries.setDictionariesKey(keyStr); sysDictionaries.setDictionariesName(userRegVo.getDoctorRank()); sysDictionaries.setCreateUserId(createUserId); sysDictionaries.setCreateUserName(createUserName); @@ -963,6 +967,9 @@ } else { listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID); } + listVoList.sort((e1,e2)-> + e2.getUserId().compareTo(e1.getUserId()) + ); return ResultBody.ok().data(listVoList); } else { return ResultBody.failed("医院数据有误"); -- Gitblit v1.8.0