| 
					
				 | 
			
			
				@@ -97,7 +97,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="vo.sourceType != null and vo.sourceType != ''"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             and u.source_type = #{vo.sourceType} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <if test="vo.isArchive != null and vo.isArchive != ''"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <if test="vo.isArchive != null"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <choose> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <when test="vo.isArchive == 0"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     AND (u.is_archive = #{vo.isArchive} OR u.is_archive IS NULL) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -183,7 +183,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="vo.sourceType != null and vo.sourceType != ''"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             and u.source_type = #{vo.sourceType} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </if> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <if test="vo.isArchive != null and vo.isArchive != ''"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <if test="vo.isArchive != null"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <choose> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <when test="vo.isArchive == 0"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     AND (u.is_archive = #{vo.isArchive} OR u.is_archive IS NULL) 
			 |