diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java index 58c993a..36396e4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java @@ -146,11 +146,11 @@ public class MiniTestCulturalService { artTestCulturalDto.setDetail(yxSchoolMajor.getDetail()); // artTestCulturalDto.setProbabilityOperator(yxSchoolMajor.getProbabilityOperator()); // artTestCulturalDto.setRulesEnrollProbability(yxSchoolMajor.getRulesEnrollProbability()); - if(StringUtils.isBlank(yxSchoolMajor.getPrivateProbabilityOperator())){ + if(StringUtils.isBlank(yxHistoryMajorEnroll.getProbabilityOperator())){ continue; } - artTestCulturalDto.setProbabilityOperator(yxSchoolMajor.getPrivateProbabilityOperator()); - artTestCulturalDto.setRulesEnrollProbability(yxSchoolMajor.getPrivateRulesEnrollProbability()); + artTestCulturalDto.setProbabilityOperator(yxHistoryMajorEnroll.getProbabilityOperator()); + artTestCulturalDto.setRulesEnrollProbability(yxHistoryMajorEnroll.getRulesEnrollProbability()); artTestCulturalDto.setMajorNameAll(yxSchoolMajor.getMajorName() + "[" + yxSchoolMajor.getCategory() + "]" + "(" + yxSchoolMajor.getBatch() + ")"); if (yxHistoryMajorEnroll!=null) {