|  | @@ -267,6 +267,9 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 | 
	
		
			
				|  |  |  						}else if(noRepliedNum<=0&¬SubmitNum<=0){
 | 
	
		
			
				|  |  |  							homeworkListDto.setStatus(3);
 | 
	
		
			
				|  |  |  						}
 | 
	
		
			
				|  |  | +						if(homeworkListDto.getIsSubmit() == 0){
 | 
	
		
			
				|  |  | +							homeworkListDto.setIsReplied(0);
 | 
	
		
			
				|  |  | +						}
 | 
	
		
			
				|  |  |  					}
 | 
	
		
			
				|  |  |  					dataList.addAll(byIdList);
 | 
	
		
			
				|  |  |  				}
 | 
	
	
		
			
				|  | @@ -300,12 +303,16 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 | 
	
		
			
				|  |  |  						}else if(noRepliedNum<=0&¬SubmitNum<=0){
 | 
	
		
			
				|  |  |  							teacherHomeworkListDto.setStatus(3);
 | 
	
		
			
				|  |  |  						}
 | 
	
		
			
				|  |  | +						if(teacherHomeworkListDto.getIsSubmit() == 0){
 | 
	
		
			
				|  |  | +							teacherHomeworkListDto.setIsReplied(0);
 | 
	
		
			
				|  |  | +						}
 | 
	
		
			
				|  |  |  					}
 | 
	
		
			
				|  |  |  					dataList.addAll(byIdList);
 | 
	
		
			
				|  |  |  				}
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  			dataList.removeAll(Collections.singleton(null));
 | 
	
		
			
				|  |  | -			dataList = dataList.stream().sorted(Comparator.comparing(TeacherHomeworkListDto::getDay).reversed()).collect(Collectors.toList());
 | 
	
		
			
				|  |  | +			dataList = dataList.stream().sorted(Comparator.comparing(TeacherHomeworkListDto::getDay).reversed()).
 | 
	
		
			
				|  |  | +					sorted(Comparator.comparing(TeacherHomeworkListDto::getIsReplied)).collect(Collectors.toList());
 | 
	
		
			
				|  |  |  			pageInfo.setRows(dataList);
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  		return pageInfo;
 |