From 53d363bf394c4006891477a5801fc04f59f7ad33 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 29 Apr 2024 15:59:57 +0800
Subject: [PATCH] =?UTF-8?q?updates=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/YxCalculationMajorServiceImpl.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 372e462..9f98def 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
@@ -130,14 +130,14 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
             pageSize = 5;
         }
         //获取当前分数
-        YxUserScore activeCurrentUserScore = null;
-        if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) {
-            //是根据成绩单来的
-            activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId());
-        } else {
-            //直接获取当前使用中的成绩单
-            activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
-        }
+        YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();;
+//        if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) {
+//            //是根据成绩单来的
+//            activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId());
+//        } else {
+//            //直接获取当前使用中的成绩单
+//            activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
+//        }
         queryRecommendMajorVO.setScoreId(activeCurrentUserScore.getId());
         //文理分科
         queryRecommendMajorVO.setCognitioPolyclinic(activeCurrentUserScore.getCognitioPolyclinic());