Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-08-28 4bd194307bd9b5c78b0c43b8fbd22be1155bcc01

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

@@ -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("医院数据有误");