Merge branch 'feature/0406-degree' of http://git.dayaedu.com/yonge/mec into feature/0406-degree

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -349,16 +349,20 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             DegreeRegistration userLevelDegree = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     degree.getId(),DegreeTypeEnum.GRADE,levels,degreeRegistration.getSubjectId());
             if(Objects.nonNull(userLevelDegree)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的 专业考级/级别" + userLevelDegree.getLevel() +  " 已报名，请勿重复选择");
+                StringBuffer sb = new StringBuffer("您选择的");
+                sb.append("\"").append("专业考级-级别").append(userLevelDegree.getLevel()).append("\"").append("已报名，请勿重复选择");
+                return BaseController.failed(HttpStatus.CREATED, sb.toString());
             }
         }
         collect = registrationDtos.stream().filter(e -> e.getType() == DegreeTypeEnum.THEORY).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(collect)){
             String levels = collect.stream().map(e -> e.getLevel()).collect(Collectors.joining(","));
             DegreeRegistration userLevelDegree = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
-                    degree.getId(),DegreeTypeEnum.THEORY,levels,degreeRegistration.getSubjectId());
+                    degree.getId(),DegreeTypeEnum.THEORY,levels,null);
             if(Objects.nonNull(userLevelDegree)){
-                return BaseController.failed(HttpStatus.CREATED, "您选择的  乐理考级/级别" + userLevelDegree.getLevel() +  " 已报名，请勿重复选择");
+                StringBuffer sb = new StringBuffer("您选择的");
+                sb.append("\"").append("乐理考级-级别").append(userLevelDegree.getLevel()).append("\"").append("已报名，请勿重复选择");
+                return BaseController.failed(HttpStatus.CREATED, sb.toString());
             }
         }
         return BaseController.succeed();