From 49c09dae61efa03094e3d930331911999193a518 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Tue, 25 Jun 2024 07:22:18 +0800
Subject: [PATCH] updates

---
 .../modules/mini/controller/MiniMajorController.java     | 9 ++++++---
 .../jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml  | 1 +
 .../yx/service/impl/YxCalculationMajorServiceImpl.java   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java
index b8e4d8c..10d7a75 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniMajorController.java
@@ -114,6 +114,7 @@ public class MiniMajorController {
             dataList = JSONArray.parseArray(json, Map.class);
         } else {
             String str = null;
+            List<String> notList= Arrays.asList("文7专3","专过文排","文8专2","文6专4","文5专5");
             if (queryRecommendMajorVO.getProfessionalCategory().equals("音乐类")) {
                 str = "[\"文过专排主科\",\"文过专排\",\"专过文排\",\"文1专1\",\"文3专7\",\"文3专10\",\"文4专10\",\"文4专6\",\"文5专10\",\"文5专5\",\"文6专10\",\"文6专4\",\"文7专3\"]";
             } else if (queryRecommendMajorVO.getProfessionalCategory().equals("体育类")) {
@@ -125,9 +126,11 @@ public class MiniMajorController {
             List<String> javaList = objects.toJavaList(String.class);
             for (String s : javaList) {
                 data = new LinkedHashMap<>();
-                data.put("label", s);
-                data.put("value", s);
-                dataList.add(data);
+                if (notList.contains(s)) {
+                    data.put("label", s);
+                    data.put("value", s);
+                    dataList.add(data);
+                }
             }
             json = JSONObject.toJSONString(dataList);
             redisUtil.set(key, json, 3600);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml
index 65f88f0..94d8ade 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml
@@ -13,6 +13,7 @@
         m.major_desc as majorRemarks,
         sm.semester as studyYear,
         sm.limitation,
+        sm.state,
         sm.major_name,
         sm.major_type,
         sm.major_type_child,
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 8466375..703bd7d 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
@@ -133,7 +133,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
             pageSize = 5;
         }
         //获取当前分数
-        YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();;
+        YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
 //        if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) {
 //            //是根据成绩单来的
 //            activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId());