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

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

@@ -358,7 +358,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         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)){
                 StringBuffer sb = new StringBuffer("您选择的");
                 sb.append("\"").append("乐理考级-级别").append(userLevelDegree.getLevel()).append("\"").append("已报名，请勿重复选择");