|
@@ -106,10 +106,10 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
|
|
|
|
|
|
SysUser sysUser2 = sysUserService.getById(g.getTeamTeacherId());
|
|
|
if(sysUser1 != null){
|
|
|
- musicGroupResp.setTeamTeacherName(sysUser1.getUsername());
|
|
|
+ musicGroupResp.setTeamTeacherName(sysUser1.getRealName());
|
|
|
}
|
|
|
if(sysUser2 != null){
|
|
|
- musicGroupResp.setEduTeacherName(sysUser2.getUsername());
|
|
|
+ musicGroupResp.setEduTeacherName(sysUser2.getRealName());
|
|
|
}
|
|
|
musicGroupResps.add(musicGroupResp);
|
|
|
});
|
|
@@ -168,10 +168,10 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
|
|
|
|
|
|
SysUser sysUser2 = sysUserService.getById(musicGroup.getTeamTeacherId());
|
|
|
if(sysUser1 != null){
|
|
|
- musicGroupResp.setTeamTeacherName(sysUser1.getUsername());
|
|
|
+ musicGroupResp.setTeamTeacherName(sysUser1.getRealName());
|
|
|
}
|
|
|
if(sysUser2 != null){
|
|
|
- musicGroupResp.setEduTeacherName(sysUser2.getUsername());
|
|
|
+ musicGroupResp.setEduTeacherName(sysUser2.getRealName());
|
|
|
}
|
|
|
baseResponse.setDataInfo(musicGroupResp);
|
|
|
baseResponse.setReturnCode(ReturnCodeEnum.CODE_200.getCode());
|
|
@@ -222,7 +222,7 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
|
|
|
queryWrapper.in("id_",firstId);
|
|
|
List<SysUser> sysUserList = sysUserService.list(queryWrapper);
|
|
|
if(!CollectionUtils.isEmpty(sysUserList)){
|
|
|
- classGroupResp.setFirstTehNameList(sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList()));
|
|
|
+ classGroupResp.setFirstTehNameList(sysUserList.stream().map(SysUser::getRealName).collect(Collectors.toList()));
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -234,7 +234,7 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
|
|
|
queryWrapper.in("id_",secdId);
|
|
|
List<SysUser> sysUserList = sysUserService.list(queryWrapper);
|
|
|
if(!CollectionUtils.isEmpty(sysUserList)){
|
|
|
- classGroupResp.setSecdTehNameList(sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList()));
|
|
|
+ classGroupResp.setSecdTehNameList(sysUserList.stream().map(SysUser::getRealName).collect(Collectors.toList()));
|
|
|
}
|
|
|
}
|
|
|
groupRespList.add(classGroupResp);
|
|
@@ -262,7 +262,7 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
|
|
|
|
|
|
SysUser sysUser = sysUserService.getById(stud.getUserId());
|
|
|
if(sysUser != null){
|
|
|
- classStudentResp.setName(sysUser.);
|
|
|
+ classStudentResp.setName(sysUser.getRealName());
|
|
|
classStudentResp.setAvatar(sysUser.getAvatar());
|
|
|
}
|
|
|
QueryWrapper<StudentAttendance> truntWrapper = new QueryWrapper<>();
|