From 88933bb12fc03ed4678165f73993d2ab0186cad0 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 14 Jun 2024 10:11:15 +0800
Subject: [PATCH] updates

---
 .../yx/service/impl/YxCalculationMajorServiceImpl.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 399193b..eba207d 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,11 @@ 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()) &&
-                    !r.getMajorType().equals("体育类") &&
-                    (!rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbability())||!rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx()))){
+            if(!r.getMajorType().equals("体育类") &&
+                        (   !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbability()) ||
+                                (StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) && !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())
+                        )
+            )){
                 r.setRulesEnrollProbability(null);
             }
         });