| 
						
						
							
								
							
						
						
					 | 
					@ -75,11 +75,11 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    </if> | 
					 | 
					 | 
					                    </if> | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    <if test="subCondition.queryType!= null and subCondition.queryType == 'notnull' "> | 
					 | 
					 | 
					                    <if test="subCondition.queryType!= null and subCondition.queryType == 'notnull' "> | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                        <if test="null!=subCondition.columnValue[0] and '1'!=subCondition.columnValue[0]"> | 
					 | 
					 | 
					                        <if test="null!=subCondition.columnValue[0] and '1'=subCondition.columnValue[0]"> | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                            and ${subCondition.tableName}.${subCondition.columnName} is not null | 
					 | 
					 | 
					                            and ${subCondition.tableName}.${subCondition.columnName} is not null | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            and ${subCondition.tableName}.${subCondition.columnName} !='' | 
					 | 
					 | 
					                            and ${subCondition.tableName}.${subCondition.columnName} !='' | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        </if> | 
					 | 
					 | 
					                        </if> | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                        <if test="null!=subCondition.columnValue[0] and '0'!=subCondition.columnValue[0]"> | 
					 | 
					 | 
					                        <if test="null!=subCondition.columnValue[0] and '0'=subCondition.columnValue[0]"> | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                            and (${subCondition.tableName}.${subCondition.columnName} is null | 
					 | 
					 | 
					                            and (${subCondition.tableName}.${subCondition.columnName} is null | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            or ${subCondition.tableName}.${subCondition.columnName} ='') | 
					 | 
					 | 
					                            or ${subCondition.tableName}.${subCondition.columnName} ='') | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        </if> | 
					 | 
					 | 
					                        </if> | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |