| 
					
				 | 
			
			
				@@ -400,7 +400,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 and sch.standard_flag_ in ('STANDARD','EXCELLENT') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="finishStatus == false"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                and sch.standard_flag_  not in ('STANDARD','EXCELLENT') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                and (sch.standard_flag_  not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="versionTag != null"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -421,7 +421,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 and sch.standard_flag_ in ('STANDARD','EXCELLENT') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <if test="finishStatus == false"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                and sch.standard_flag_  not in ('STANDARD','EXCELLENT') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                and (sch.standard_flag_  not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="versionTag != null"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -730,7 +730,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         left join course_homework ch on ch.id_ = sch.course_homework_id_ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         WHERE 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             sch.user_id_ = #{userId} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                AND sch.standard_flag_ not in ('STANDARD','EXCELLENT') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                AND (sch.standard_flag_ not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         and ch.expiry_date_ >= #{now} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |