From 1299cc18729ed5502a20ca4115419f09a3d01a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 18 Mar 2025 09:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HitCompetitionStudentInfoServiceImpl.java    | 2 +-
 .../com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java
index ea4f306..b19d72b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java
@@ -99,7 +99,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
         }
         //当前教师的学校
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserId(loginUser.getUserId(), hitCompetitionStudentInfo.getYear());
+        HitRegistrationTeachInfo hitRegistrationTeachInfo = hitRegistrationTeachInfoMapper.selectHitRegistrationTeachInfoByUserIdNoYear(loginUser.getUserId());
         if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo) && hitRegistrationTeachInfo.getStatus().equals("1")) {
             hitCompetitionStudentInfo.setSchoolName(hitRegistrationTeachInfo.getSchoolName());
         }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
index e996d59..c183093 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
@@ -96,8 +96,8 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService {
         }
         Long userId = SecurityUtils.getLoginUser().getUserId();
         //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队
-        HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId, hitRegInfo.getYear());
-        if (teacherInfo != null && teacherInfo.getType().equals("1")) {
+        HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserIdNoYear(userId);
+        if (teacherInfo != null) {
             hitRegInfo.setSchoolName(teacherInfo.getSchoolName());
         }
         PageUtils.startPage();