From 2ca26f4c5d2ee50e71eb2e8f8380ebca9beee230 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 23 Jun 2025 19:46:34 +0800
Subject: [PATCH] updates

---
 .../org/jeecg/config/shiro/ShiroConfig.java   |  4 ++++
 .../impl/YxHistoryMajorEnrollServiceImpl.java |  3 +++
 .../yx/service/impl/YxSchoolServiceImpl.java  | 21 +++++++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 721a934..3bf74a5 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -121,6 +121,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/yx/yxHistoryScoreBatch/conversionScoreBatch","anon");//计算批次线
         filterChainDefinitionMap.put("/yx/yxHistoryScoreControlLine/list","anon");//省控线列表
 
+        filterChainDefinitionMap.put("/mini/school/search","anon");//院校查询
+
+        filterChainDefinitionMap.put("/mini/major/miniMajorList","anon");//院校查询
+
         /*filterChainDefinitionMap.put("/art/recommendMajor/page","anon");
         filterChainDefinitionMap.put("/art/recommendMajor/list","anon");*/
         // 配置不会被拦截的链接 顺序判断
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
index ba15661..ddfc103 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
@@ -56,6 +56,9 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
 
     @Override
     public Map<String,YxHistoryMajorEnroll> getDataGroupBySchoolCodeAndMaxYear(String professionalCategory,List<String> schoolCodeList) {
+        if (StringUtils.isBlank(professionalCategory)) {
+            return new HashMap<>();
+        }
         List<YxHistoryMajorEnroll> list = baseMapper.getDataGroupBySchoolCodeAndMaxYear(professionalCategory,schoolCodeList);
         Map<String,YxHistoryMajorEnroll> dataMaps=new LinkedHashMap<>();
         for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) {
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java
index dd19ccd..8360aa6 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java
@@ -66,13 +66,17 @@ public class YxSchoolServiceImpl extends ServiceImpl<YxSchoolMapper, YxSchool> i
         if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) {
             queryRecommendMajorVO.setTagsList(Arrays.asList(queryRecommendMajorVO.getTagsStrs().split(",")));
         }
-        YxUserScore currentUserScore = yxUserScoreService.getActiveCurrentUserScore();
-        String professionalCategory = currentUserScore.getProfessionalCategory();//专业类别
-        String professionalCategoryChildren = currentUserScore.getProfessionalCategoryChildren();//子类
-        List<String> pCategoryChildrenList = ScoreUtil.checkProfessionalCategoryToChildrenList(professionalCategoryChildren);
-        queryRecommendMajorVO.setCognitioPolyclinic(currentUserScore.getCognitioPolyclinic());
-        queryRecommendMajorVO.setProfessionalCategory(professionalCategory);
-        queryRecommendMajorVO.setPCategoryChildrenList(pCategoryChildrenList);
+        YxUserScore currentUserScore = null;
+        String professionalCategory = null;
+        try {
+            currentUserScore = yxUserScoreService.getActiveCurrentUserScore();
+            professionalCategory = currentUserScore.getProfessionalCategory();//专业类别
+            String professionalCategoryChildren = currentUserScore.getProfessionalCategoryChildren();//子类
+            List<String> pCategoryChildrenList = ScoreUtil.checkProfessionalCategoryToChildrenList(professionalCategoryChildren);
+            queryRecommendMajorVO.setCognitioPolyclinic(currentUserScore.getCognitioPolyclinic());
+            queryRecommendMajorVO.setProfessionalCategory(professionalCategory);
+            queryRecommendMajorVO.setPCategoryChildrenList(pCategoryChildrenList);
+        }catch (Exception e){}
         if (StringUtils.isNotBlank(queryRecommendMajorVO.getMajorCode())) {
             dtoPage = baseMapper.miniSchoolSearchSm(page, queryRecommendMajorVO);
         }else{
@@ -92,8 +96,7 @@ public class YxSchoolServiceImpl extends ServiceImpl<YxSchoolMapper, YxSchool> i
             List<YxSchoolMajor> xkList = yxSchoolMajorService.list(schoolMajorLambdaQueryWrapper);
             Set<String> schoolCodeSet = xkList.stream().map(YxSchoolMajor::getSchoolCode).collect(Collectors.toSet());
             //获取 院校的招生数量
-            Map<String, Integer> planNumMap = yxSchoolMajorService.getSchoolMajorPlanSumByTypeAndCode(currentUserScore.getProfessionalCategory(), schoolCodeList);
-
+            Map<String, Integer> planNumMap = yxSchoolMajorService.getSchoolMajorPlanSumByTypeAndCode(professionalCategory, schoolCodeList);
             Set<String> tagsList;
             long startTime = new Date().getTime();
             Integer planNum=0;