Merge branch 'master' of http://121.40.40.223:3000/wiipu/boniu

api/v1.0/stock_list.php

@@ -24,14 +24,21 @@ try {
 
 
     //参数
-    $filter = array();
-    $filter["sector"]=$sector;
+    if($sector!=0){
+        $filter = array();
+        $filter["sector"]=$sector;
+    }
+
+
     //总数
     $params=array();
     $count_num=Stock::getStockList($filter,11,$page, $pagesize);//总条数
     if($pagesize!=0){
         $count_page=ceil($count_num/$pagesize);//总页数
     }
+    else{
+        $count_page=1;
+    }
     $params['message_code']=API::SUCCESS;
     $params['message']=API::SUCCESS_MSG;
     $params['sector']=$sector;