|
|
@@ -464,11 +464,11 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
|
CourseEducationType educationType = iCourseEducationTypeService.getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getStatus, 1).eq(CourseEducationType::getEducationName,"继续教育").last("limit 1"));
|
|
|
CourseProjectType projectType = iCourseProjectTypeService.getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getStatus, 1).eq(CourseProjectType::getEducationId,educationType.getId()).eq(CourseProjectType::getProjectName,"建造师").last("limit 1"));
|
|
|
CourseBusiness business = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getProjectId,projectType.getId()).eq(CourseBusiness::getBusinessName,"二级").last("limit 1"));
|
|
|
- CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getBusinessName,"七大员新考").last("limit 1"));
|
|
|
GoodsVo goodsVo = iGoodsService.queryById(bo.getGoodsId());
|
|
|
if(goodsVo.getBusinessId().longValue()!=business.getId().longValue()){
|
|
|
- if(Validator.isNotEmpty(business7.getId())&&goodsVo.getBusinessId().longValue()!=business7.getId().longValue()){
|
|
|
- throw new CustomException("非继续二建或七大员新考无法打回");
|
|
|
+ CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getId,goodsVo.getBusinessId()).last("limit 1"));
|
|
|
+ if(Validator.isEmpty(business7)||(Validator.isNotEmpty(business7)&&!"七大员".equals(business7.getBusinessName()))){
|
|
|
+ throw new CustomException("非继续二建或七大员无法打回");
|
|
|
}
|
|
|
}
|
|
|
//查询此人学时审核是否有权限,老系统不进行权限校验
|
he2802