| 
														
															@@ -152,7 +152,7 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         Page<StudentAttendanceStatisticsResp> pageResult = new Page(); 
														 | 
														
														 | 
														
															         Page<StudentAttendanceStatisticsResp> pageResult = new Page(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         ClassGroup classGroup = groupService.getById(classGroupReq.getGroupId()); 
														 | 
														
														 | 
														
															         ClassGroup classGroup = groupService.getById(classGroupReq.getGroupId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (Objects.nonNull(classGroup)) { 
														 | 
														
														 | 
														
															         if (Objects.nonNull(classGroup)) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            List<String> subjectNameList = Lists.newArrayList(); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            List<String> subjectNameList; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             if (Objects.nonNull(classGroupReq.getSubjectId())) { 
														 | 
														
														 | 
														
															             if (Objects.nonNull(classGroupReq.getSubjectId())) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 subjectNameList = Lists.newArrayList(subjectService.getById(classGroupReq.getSubjectId()).getName()); 
														 | 
														
														 | 
														
															                 subjectNameList = Lists.newArrayList(subjectService.getById(classGroupReq.getSubjectId()).getName()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             } else { 
														 | 
														
														 | 
														
															             } else { 
														 |