|
@@ -497,7 +497,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),StringUtils.join(collect1,",")
|
|
|
,null,2,degreeRegistration.getSubject());
|
|
|
if(!CollectionUtils.isEmpty(userLevelDegrees)){
|
|
|
- return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() + " 乐器考级已报名,请勿重复选择");
|
|
|
+ return BaseController.failed(HttpStatus.CREATED, "您选择的 " + userLevelDegrees.get(0).getLevel() + " 乐器考级已报名,请勿重复选择");
|
|
|
}
|
|
|
}
|
|
|
collect = registrationDtos.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
|
|
@@ -506,7 +506,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
|
|
|
DegreeRegistrationService.ACTIVITY_TAG,degreeRegistration.getDegreeType(),null,StringUtils.join(collect1,","),2,null);
|
|
|
if(!CollectionUtils.isEmpty(userLevelDegrees)){
|
|
|
- return BaseController.failed(HttpStatus.CREATED, "您选择的 " + collect.get(0).getLevel() + " 乐理考级已报名,请勿重复选择");
|
|
|
+ return BaseController.failed(HttpStatus.CREATED, "您选择的 " + userLevelDegrees.get(0).getLevel() + " 乐理考级已报名,请勿重复选择");
|
|
|
}
|
|
|
}
|
|
|
return BaseController.succeed();
|