From 558310aaa0cdec15fca71a937080a0aeb10c9f1f Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 5 Jun 2024 18:34:36 +0800
Subject: [PATCH] updates

---
 .../modules/yx/mapper/xml/YxCalculationMajorMapper.xml      | 1 +
 .../src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java  | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml
index 3529b53..237d70c 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml
@@ -77,6 +77,7 @@
         <if test="queryvo.schoolName!=null and queryvo.schoolName!=''">
             AND (s.school_name like concat('%',#{queryvo.schoolName},'%') or sc.schooL_code like
             concat('%',#{queryvo.schoolName},'%') or cm.major_name like
+            concat('%',#{queryvo.schoolName},'%') or cm.major_detail like
             concat('%',#{queryvo.schoolName},'%'))
         </if>
         <if test="queryvo.schoolCode!=null and queryvo.schoolCode!=''">
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java
index 35735f5..d6b356b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java
@@ -10,10 +10,7 @@ import org.jeecg.modules.yx.entity.YxUserScore;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description 分数计算工具1
@@ -549,4 +546,5 @@ public class ScoreUtil {
         }
         return enrollProbability;
     }
+
 }