From baf32ff21791102d03fa74d1f66a760fc4614513 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 14 Jun 2024 09:54:35 +0800
Subject: [PATCH] updates

---
 .../yx/service/impl/YxCalculationMajorServiceImpl.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
index eebaaeb..c0e60cc 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
@@ -264,9 +264,9 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
         List<String> rulesEnrollProbabilitySxList = Arrays.asList("专过文排", "文8专2", "文*0.8+文*0.5", "文7专3", "文*0.7+文*0.75", "文6专4", "文*0.6+专*1", "文5专5", "文*0.5+专*1.25");
         recommendMajorList.forEach(r->{
             r.setPlanNum(null);
-            if (StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) &&
+            if(StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) &&
                     !r.getMajorType().equals("体育类") &&
-                    !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) {
+                    !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbability())||!rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())){
                 r.setRulesEnrollProbability(null);
             }
         });