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

@@ -107,12 +107,16 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             if(registrationDto.getType() == DegreeTypeEnum.THEORY){
                 one = degreeLevelFeeService.lambdaQuery()
                         .eq(DegreeLevelFeeNew::getDegreeType, registrationDto.getType())
-                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel()).one();
+                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel())
+                        .eq(DegreeLevelFeeNew::getTenantId,degreeRegistration.getTenantId())
+                        .one();
             }else {
                 one = degreeLevelFeeService.lambdaQuery()
                         .eq(DegreeLevelFeeNew::getSubjectId, degreeRegistration.getSubjectId())
                         .eq(DegreeLevelFeeNew::getDegreeType, registrationDto.getType())
-                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel()).one();
+                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel())
+                        .eq(DegreeLevelFeeNew::getTenantId,degreeRegistration.getTenantId())
+                        .one();
             }
             if(Objects.isNull(one)){
                 throw new BizException("该级别已不可报名");