| 
					
				 | 
			
			
				@@ -107,13 +107,16 @@ class Api 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return mixed 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public function getAll($column) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public function getAll($column, $cate = false) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $where = array(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ($column > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $where['column_id'] = $column; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $result = Dever::db('category/info')->state($where); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if ($cate) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            $where['info_id'] = $cate; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $result = Dever::db('category/info')->getList($where); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return $result; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |