forked from kidgrow-microservices-platform
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -107,7 +107,11 @@ @Override public LoginAppUser findByOpenId(String username) { SysUser sysUser = this.selectByOpenId(username); return getLoginAppUser(sysUser); if (sysUser == null) { return null; } else { return getLoginAppUser(sysUser); } } @Override @@ -124,6 +128,7 @@ */ @Override public LoginAppUser getLoginAppUser(SysUser sysUserNew) { log.error(sysUserNew.toString()); LoginAppUser loginAppUser = new LoginAppUser(); SysUser sysUser = this.baseMapper.selectById(sysUserNew); if (sysUser != null) { @@ -138,7 +143,6 @@ List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId()); // 设置角色 loginAppUser.setRoles(sysRoles); if (!CollectionUtils.isEmpty(sysRoles)) { Set<Long> roleIds = sysRoles.parallelStream().map(SuperEntity::getId).collect(Collectors.toSet()); List<SysMenu> menus = roleMenuMapper.findMenusByRoleIds(roleIds, CommonConstant.PERMISSION); @@ -149,7 +153,6 @@ loginAppUser.setPermissions(permissions); } } //医院信息 DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId()); if (doctorUserAllVo != null) { @@ -272,7 +275,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 +301,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) { @@ -326,15 +329,13 @@ Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit")); List<SysUser> list = baseMapper.findList(page, params); long total = page.getTotal(); if (total > 0) { if (total > 0&&list.size()>0) { List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList()); List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds); // Map<String, Object> map = new HashMap<String, Object>(); // List<SysOrganization> sysOrganizationList=organizationService.fin(); list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId())) .collect(Collectors.toList()))); if (userIds.size()>0) { List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds); list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId())) .collect(Collectors.toList()))); } } return PageResult.<SysUser>builder().data(list).code(0).count(total).build(); } @@ -703,6 +704,7 @@ sysOrganizationH.setCreateUserId(createUserId); sysOrganizationH.setCreateUserName(createUserName); if (organizationService.save(sysOrganizationH)) { organizationHos=sysOrganizationH.getId(); //写科室组织数据 SysOrganization sysOrganizationD = new SysOrganization(); sysOrganizationD.setOrgLevel(2); @@ -712,6 +714,7 @@ sysOrganizationD.setCreateUserId(createUserId); sysOrganizationD.setCreateUserName(createUserName); if (organizationService.save(sysOrganizationD)) { organizationDep=sysOrganizationD.getId(); //写医院组织数据 SysHospital sysHospital = new SysHospital(); sysHospital.setHospitalName(userRegVo.getHospitalName()); @@ -795,7 +798,11 @@ sysUser.setType(UserType.DOCTOR.name()); } sysUser.setHAdminUser(false); sysUser.setDefaultAuth(false); if(isReg){ sysUser.setDefaultAuth(false); }else{ sysUser.setDefaultAuth(true); } sysUser.setOpenId(userRegVo.getOpenId()); sysUser.setDel(false); sysUser.setTenantId(CommonConstant.H_TENANT); @@ -835,7 +842,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); @@ -847,6 +858,10 @@ if (dicBool) { //写用户组织关系表 SysHospital byId = hospitalService.getById(userRegVo.getHospitalId()); if(byId!=null){ organizationHos=byId.getOrgId(); } List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>(); sysUserOrgH.setUserId(sysUser.getId()); sysUserOrgH.setOrgId(organizationHos); @@ -855,7 +870,10 @@ sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId()); sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername()); sysUserOrgList.add(sysUserOrgH); SysDepartment department = departmentService.getById(userRegVo.getDepartmentId()); if(department!=null){ organizationDep=department.getOrgId(); } sysUserOrgD.setUserId(sysUser.getId()); sysUserOrgD.setOrgId(organizationDep); sysUserOrgD.setFromId(userRegVo.getDepartmentId()); @@ -963,6 +981,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("医院数据有误");
