|  | @@ -120,7 +120,30 @@ class Article extends DooModel {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	function getArticleNumByTrain2($trainingType= '',$area = ''){
 | 
	
		
			
				|  |  | -		$sql = '';
 | 
	
		
			
				|  |  | +		
 | 
	
		
			
				|  |  | +		$condition='a_type=2 ';
 | 
	
		
			
				|  |  | +		$parameter=array();
 | 
	
		
			
				|  |  | +		if($trainingType != '' && is_numeric($trainingType)){
 | 
	
		
			
				|  |  | +			$condition.= '  and trainingType= ?';
 | 
	
		
			
				|  |  | +			array_push($parameter, $trainingType);
 | 
	
		
			
				|  |  | +		}
 | 
	
		
			
				|  |  | +		if($area != ''){
 | 
	
		
			
				|  |  | +			$condition.= ' and area=?';
 | 
	
		
			
				|  |  | +			array_push($parameter, $area);
 | 
	
		
			
				|  |  | +		}
 | 
	
		
			
				|  |  | +		$condition.=' and time+63072000 >= unix_timestamp(now())';
 | 
	
		
			
				|  |  | +		
 | 
	
		
			
				|  |  | +		$qualification=array(
 | 
	
		
			
				|  |  | +				'where' => $condition,
 | 
	
		
			
				|  |  | +				'param' => $parameter,
 | 
	
		
			
				|  |  | +				'asArray' => TRUE);
 | 
	
		
			
				|  |  | +		
 | 
	
		
			
				|  |  | +		
 | 
	
		
			
				|  |  | +		
 | 
	
		
			
				|  |  | +		return $this->count($qualification);
 | 
	
		
			
				|  |  | +		
 | 
	
		
			
				|  |  | +		
 | 
	
		
			
				|  |  | +		/* $sql = '';
 | 
	
		
			
				|  |  |  		if($trainingType != '' && is_numeric($trainingType)){
 | 
	
		
			
				|  |  |  			$sql .= '  and trainingType='.$trainingType;
 | 
	
		
			
				|  |  |  		}
 | 
	
	
		
			
				|  | @@ -128,7 +151,7 @@ class Article extends DooModel {
 | 
	
		
			
				|  |  |  			$sql .= ' and area="'.$area.'"';
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  		$sql .= ' and time+63072000 >= unix_timestamp(now())';
 | 
	
		
			
				|  |  | -		return $this->count ( array ('where' => 'a_type=2'.$sql, 'asArray' => TRUE ) );
 | 
	
		
			
				|  |  | +		return $this->count ( array ('where' => 'a_type=2'.$sql, 'asArray' => TRUE ) ); */
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	function getArticleByTrainAid($aid){
 |