From e854f758820b64dc0efe83f95f721dc39927fb33 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Thu, 12 Jun 2025 10:47:51 +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

---
 .../com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java     | 4 +++-
 ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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 2599f9a..7155e4f 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
@@ -115,7 +115,9 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService {
                     }
                     case "2": {
                         HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserIdNoYear(regInfoUser.getUserId());
-                        regInfo.getZdTeacher().add(hitRegistrationTeachInfo);
+                        if (hitRegistrationTeachInfo != null) {
+                            regInfo.getZdTeacher().add(hitRegistrationTeachInfo);
+                        }
                         break;
                     }
                     case "1":
diff --git a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
index 4282628..41c7b42 100644
--- a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
+++ b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
@@ -100,7 +100,7 @@
 
       <el-table-column type="expand">
         <template slot-scope="props">
-          <el-descriptions :title="'领队老师'" style="margin-left: 10%">
+          <el-descriptions :title="'领队老师'" style="margin-left: 10%" v-if="props.row.ldTeacher">
             <el-descriptions-item label="老师姓名">{{ props.row.ldTeacher.teacherName }}</el-descriptions-item>
             <el-descriptions-item label="老师职务">{{ props.row.ldTeacher.teacherJob }}</el-descriptions-item>
             <el-descriptions-item label="老师手机号">{{ props.row.ldTeacher.teacherNumber }}</el-descriptions-item>
@@ -511,6 +511,7 @@ export default {
           for (let i = 0; i < this.HitRegistrationStudentInfoList.length; i++) {
             //判断当前登录用户是否为指导老师
             this.HitRegistrationStudentInfoList[i].zdTeacherList = this.HitRegistrationStudentInfoList[i].zdTeacher.map(teacher => teacher.userId)
+            console.log('看看执行报错的地方')
             this.HitRegistrationStudentInfoList[i].registrationInformation = {}
             //循环this.registrationInformation
             if (this.registrationInformation) {