From 9dd3eb5714d14ba23e8332cb1cb694477846fb0d Mon Sep 17 00:00:00 2001
From: zhouwentao <zwt13703@gmail.com>
Date: Tue, 16 Dec 2025 17:48:08 +0800
Subject: [PATCH] feat: updates

---
 .../java/org/jeecg/modules/web/service/WebMajorService.java  | 1 -
 .../yx/service/impl/YxCalculationMajorServiceImpl.java       | 3 ++-
 .../jeecg/modules/yx/service/impl/YxMajorServiceImpl.java    | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebMajorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebMajorService.java
index a75e2ed..5a19fea 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebMajorService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebMajorService.java
@@ -7,7 +7,6 @@ import org.jeecg.modules.web.dto.WebMajorDTO;
 import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
 import org.jeecg.modules.yx.dto.UserScoreDTO;
 import org.jeecg.modules.yx.mapper.YxMajorMapper;
-import org.jeecg.modules.yx.service.IYxUserScoreService;
 import org.jeecg.modules.yx.service.impl.UserScoreService;
 import org.springframework.stereotype.Service;
 
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 59995d9..73fefcb 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
@@ -593,7 +593,8 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                     }
 
                     // && "美术学（师范）".equals(recommendMajorDTO.getMajorName())
-                    if("6501".equals(recommendMajorDTO.getSchoolCode())){
+                    if("2565".equals(recommendMajorDTO.getSchoolCode())
+                    && "视觉传达设计".equals(recommendMajorDTO.getMajorName())){
                         System.out.println("qvq");
                     }
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java
index 99246fe..3dae11d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java
@@ -15,7 +15,6 @@ import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll;
 import org.jeecg.modules.yx.entity.YxMajor;
 import org.jeecg.modules.yx.entity.YxSchoolMajor;
 import org.jeecg.modules.yx.mapper.YxMajorMapper;
-import org.jeecg.modules.yx.service.IYxFirstLevelDisciplinesService;
 import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService;
 import org.jeecg.modules.yx.service.IYxMajorService;
 import org.jeecg.modules.yx.service.IYxSchoolMajorService;
@@ -36,8 +35,6 @@ import java.util.stream.Collectors;
  */
 @Service
 public class YxMajorServiceImpl extends ServiceImpl<YxMajorMapper, YxMajor> implements IYxMajorService {
-    @Resource
-    private IYxFirstLevelDisciplinesService yxFirstLevelDisciplinesService;
     @Resource
     private IYxSchoolMajorService yxSchoolMajorService;
     @Resource
@@ -115,8 +112,6 @@ public class YxMajorServiceImpl extends ServiceImpl<YxMajorMapper, YxMajor> impl
             }
             lambdaQueryWrapper.eq(StringUtils.isNotBlank(queryRecommendMajorVO.getEducationalLevel()),YxMajor::getEducationalLevel,queryRecommendMajorVO.getEducationalLevel());
             lambdaQueryWrapper.isNotNull(YxMajor::getXkfl).isNotNull(YxMajor::getZyl);
-            //lambdaQueryWrapper.notLike(YxMajor::getMajorName,"类");//不要***类的
-//            lambdaQueryWrapper.eq(YxMajor::getMajorName,"音乐表演");
             List<YxMajor> yxMajorList = this.list(lambdaQueryWrapper);
             //没有数据，返回空集合
             if (CollectionUtils.isEmpty(yxMajorList)) {