Merge branch '0308-3.1.2' of https://gitee.com/zwyjjc/tl_estate into 0308-3.1.2

application/model/CActivity.php

@@ -34,13 +34,20 @@ class CActivity extends Model
 
     /**
      * 查询
+     *
      * @param $field
      * @param $params
      * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function getActivity($field,$params)
     {
-        $params['status'] = 0;
+        if (!isset($params['status'])) {
+            $params['status'] = 0;
+        }
+
         $result = $this->db_
             ->field($field)
             ->where($params)