|  | @@ -31,7 +31,8 @@
 | 
	
		
			
				|  |  |  				and content.title_ like '%' #{title} '%'
 | 
	
		
			
				|  |  |  			</if>
 | 
	
		
			
				|  |  |  			<if test="status!= null">
 | 
	
		
			
				|  |  | -				and content.status_ = #{status}
 | 
	
		
			
				|  |  | +				and ((content.status_ = #{status} and content.catalog_id_ = 1)
 | 
	
		
			
				|  |  | +					or (content.release_status_ = #{status} and content.catalog_id_ = 2))
 | 
	
		
			
				|  |  |  			</if>
 | 
	
		
			
				|  |  |  			<if test="catalogType != null and catalogType != ''">
 | 
	
		
			
				|  |  |  				and content.catalog_type_ = #{catalogType}
 |