From d8761b6876be39c17a001023f55549c67d462a90 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Mon, 9 Jun 2025 14:15:35 +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

---
 .../ruoyi/cms/controller/HitRegInfoController.java   |  1 +
 .../cms/service/impl/HitRegInfoServiceImpl.java      | 12 ++++++------
 .../mapper/cms/HitRegistrationTeachInfoMapper.xml    |  6 +++++-
 .../src/views/officialWebsite/Components/header.vue  |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
index 223d003..b69cf6e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
@@ -107,6 +107,7 @@ public class HitRegInfoController extends BaseController
                 list1.add(hitRegInfoExportVo);
             }catch (Exception e) {
                 log.error("导出错误,团队信息:{}", hitRegInfo1);
+                log.error("导出错误,错误信息:{}", e.getMessage());
             }
         }
 
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 7f7990e..2599f9a 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
@@ -137,10 +137,10 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService {
      */
     @Override
     public List<HitRegInfo> selectHitRegInfoListExport(HitRegInfo hitRegInfo) {
-        if (ObjectUtil.isEmpty(hitRegInfo.getYear())) {
-            //获取当前年
-            hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy"));
-        }
+//        if (ObjectUtil.isEmpty(hitRegInfo.getYear())) {
+//            //获取当前年
+//            hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy"));
+//        }
         Long userId = SecurityUtils.getLoginUser().getUserId();
         //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队
         HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId, hitRegInfo.getYear());
@@ -155,12 +155,12 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService {
             for (HitRegInfoUser regInfoUser : hitRegInfoUsers) {
                 switch (regInfoUser.getType()) {
                     case "3": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), null);
                         regInfo.setLdTeacher(hitRegistrationTeachInfo);
                         break;
                     }
                     case "2": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), null);
                         regInfo.getZdTeacher().add(hitRegistrationTeachInfo);
                         break;
                     }
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
index cab17e8..6beb5cc 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
@@ -55,7 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectHitRegistrationTeachInfoByUserId"
             resultType="com.ruoyi.common.core.domain.HitRegistrationTeachInfo">
         select * from hit_registration_teach_info
-        where user_id = #{userId} and create_time like concat(#{year},'%')
+        <where>user_id = #{userId}
+            <if test="year != null">
+                and create_time like concat(#{year},'%')
+            </if>
+        </where>
 
     </select>
     <select id="selectHitRegistrationTeachInfoByUserIdNoYear"
diff --git a/ruoyi-ui/src/views/officialWebsite/Components/header.vue b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
index 7323fe8..c97f55f 100644
--- a/ruoyi-ui/src/views/officialWebsite/Components/header.vue
+++ b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
@@ -146,7 +146,7 @@
 <!--            <image-upload :limit="1" v-model="registerForm.hitRegistrationTeachInfo.file"></image-upload>-->
             <el-upload
               ref="upload"
-              :limit="1"
+              :limit="1"system/hit_reg_info/export
               :headers="upload.headers"
               :action="upload.url + '?updateSupport=' + upload.updateSupport"
               :disabled="upload.isUploading"