dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xyc 2025-06-12 10:47:51 +08:00
parent 8872456cff
commit e854f75882
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
View File

@ -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":

3
ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
View File

@ -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) {