Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Goodup.php

@@ -82,6 +82,10 @@ class Goodup extends Base
             $where[]=['status',"=",$status];
             $condit[]=['a.status',"=",$status];
         }
+        $is_stock = isset($this->post['is_stock']) && $this->post['is_stock'] !== "" ? intval($this->post['is_stock']) : '';
+        if ($is_stock!=='') {
+            $where[] = ['is_stock', "=", $is_stock];
+        }
         $start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
         if($start!==""){
             $where[]=['addtime',">=",date('Y-m-d H:i:s',strtotime($start))];