@@ -180,6 +180,9 @@ public class ExpertAdminManage { | |||||
public ExpertBasicInfoModifyResultVO adminModifyExpertBasicInfo(AdminExpertBasicInfoModifyRequest request) { | public ExpertBasicInfoModifyResultVO adminModifyExpertBasicInfo(AdminExpertBasicInfoModifyRequest request) { | ||||
Long adminUserId = LoginUserUtil.getUserId(); | Long adminUserId = LoginUserUtil.getUserId(); | ||||
Long expertUserId = request.getExpertUserId(); | Long expertUserId = request.getExpertUserId(); | ||||
// 手机号不能更改 | |||||
request.getBasicInfo().setPhoneNo(null); | |||||
// 校验当前是否有信息变更审核 如有,无法变更信息 | // 校验当前是否有信息变更审核 如有,无法变更信息 | ||||
LambdaQueryWrapper<ExpertMetaApply> infoModifyEq = Wrappers.lambdaQuery(ExpertMetaApply.class) | LambdaQueryWrapper<ExpertMetaApply> infoModifyEq = Wrappers.lambdaQuery(ExpertMetaApply.class) | ||||
.eq(ExpertMetaApply::getUserId, expertUserId) | .eq(ExpertMetaApply::getUserId, expertUserId) | ||||
@@ -120,7 +120,7 @@ public class ExpertManage { | |||||
// 增加用户专家角色 | // 增加用户专家角色 | ||||
Role expertRole = iRoleService.getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getCode, RoleEnum.EXPERT.name())); | Role expertRole = iRoleService.getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getCode, RoleEnum.EXPERT.name())); | ||||
UserRole expertUserRole = iUserRoleService.getOne(Wrappers.lambdaQuery(UserRole.class) | UserRole expertUserRole = iUserRoleService.getOne(Wrappers.lambdaQuery(UserRole.class) | ||||
.eq(UserRole::getRoleId, expertRole.getId()).eq(UserRole::getUserId,userId)); | |||||
.eq(UserRole::getRoleId, expertRole.getId()).eq(UserRole::getUserId, userId)); | |||||
if (Objects.isNull(expertUserRole)) { | if (Objects.isNull(expertUserRole)) { | ||||
expertUserRole = new UserRole(); | expertUserRole = new UserRole(); | ||||
expertUserRole.setUserId(userId); | expertUserRole.setUserId(userId); | ||||
@@ -195,6 +195,11 @@ public class ExpertManage { | |||||
.build(); | .build(); | ||||
iUserInfoService.save(userInfo); | iUserInfoService.save(userInfo); | ||||
} | } | ||||
ExpertUserFullInfo one = iExpertUserFullInfoService.getOne(Wrappers.lambdaQuery(ExpertUserFullInfo.class) | |||||
.eq(ExpertUserFullInfo::getPhoneNo, phoneNo)); | |||||
if (Objects.nonNull(one)) { | |||||
throw new BizException("该手机号已被专家注册,请确认后再填写"); | |||||
} | |||||
return userInfo.getId(); | return userInfo.getId(); | ||||
} | } | ||||
} | } |
@@ -88,7 +88,6 @@ public class ExpertMetaApplyManage { | |||||
// 查找符合专家条件的用户id | // 查找符合专家条件的用户id | ||||
ExpertAdminExpertManageQueryCmd queryCmd = buildExpertAdminExpertManageQueryCmd(req); | ExpertAdminExpertManageQueryCmd queryCmd = buildExpertAdminExpertManageQueryCmd(req); | ||||
List<Long> filterExpertUserIdList = expertAdminManageService.filterExpertUserIdList(queryCmd); | List<Long> filterExpertUserIdList = expertAdminManageService.filterExpertUserIdList(queryCmd); | ||||
// TODO 获取所有的专家审核列表 | |||||
if (CollUtil.isEmpty(filterExpertUserIdList)) { | if (CollUtil.isEmpty(filterExpertUserIdList)) { | ||||
return PageVo.empty(); | return PageVo.empty(); | ||||
} | } | ||||
@@ -386,9 +385,9 @@ public class ExpertMetaApplyManage { | |||||
} | } | ||||
List<RegionContainsBO> containsRegion = null; | List<RegionContainsBO> containsRegion = null; | ||||
if (Objects.nonNull(query.getExpertRegion())) { | |||||
RegionContainsBO containsRegionBo = regionLimitHelper.getContainsRegionBo(query.getExpertRegion().getRegionLevel() | |||||
, query.getExpertRegion().getRegionCode()); | |||||
if (Objects.nonNull(query.getExpertRegionInfo())) { | |||||
RegionContainsBO containsRegionBo = regionLimitHelper.getContainsRegionBo(query.getExpertRegionInfo().getRegionLevel() | |||||
, query.getExpertRegionInfo().getRegionCode()); | |||||
containsRegion = CollUtil.toList(containsRegionBo); | containsRegion = CollUtil.toList(containsRegionBo); | ||||
} | } | ||||
@@ -35,7 +35,7 @@ public class MetaApplyListQuery extends PagePo { | |||||
private String titleLevelDictionaryCode; | private String titleLevelDictionaryCode; | ||||
@ApiModelProperty("专家层级") | @ApiModelProperty("专家层级") | ||||
private ExpertRegionInfo expertRegion; | |||||
private ExpertRegionInfo expertRegionInfo; | |||||
@ApiModelProperty("筛选开始时间") | @ApiModelProperty("筛选开始时间") | ||||
private LocalDateTime applyStartTime; | private LocalDateTime applyStartTime; | ||||