瀏覽代碼

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

zouxuan 2 年之前
父節點
當前提交
8d54058e9e
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

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

@@ -349,7 +349,9 @@ 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());
@@ -358,7 +360,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             DegreeRegistration userLevelDegree = degreeRegistrationDao.getUserLevelDegrees(degreeRegistration.getUserId(),
                     degree.getId(),DegreeTypeEnum.THEORY,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());
             }
         }
         return BaseController.succeed();