Merge branch 'test'

application/api_broker/controller/HomePageLog.php

@@ -72,6 +72,8 @@ class HomePageLog extends Basic
         if (empty($params['start_time']) || empty($params['end_time'])) {
             return $this->response("101", '请选择时间');
         }
+
+
         $start_time              = date("Y-m-d H:i:s", $params["start_time"]);
         $end_time                = date("Y-m-d H:i:s", $params["end_time"]);
 
@@ -87,6 +89,10 @@ class HomePageLog extends Basic
             $where .= " AND content LIKE '%$search_content%'";
         }
         if (!empty($params["start_time"]) && !empty($params["end_time"])) {
+            $time = strtotime($end_time) - strtotime($start_time);
+            if ($time > 1296000 || $time < 0) {
+                return $this->response(101, '搜索时间不能大于15天');
+            }
 
             $where_["create_time"] = array( 'between', array( $start_time, $end_time ) );
             $where .= ' AND create_time BETWEEN "'.$start_time.'"  AND "'.$end_time .'"';
@@ -179,6 +185,7 @@ class HomePageLog extends Basic
             return $this->response("101", '请选择时间');
         }
 
+
         $where_ = [];
 
         $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
@@ -193,6 +200,11 @@ class HomePageLog extends Basic
         if (!empty($params["start_time"]) && !empty($params["end_time"])) {
             $start_time              = date("Y-m-d H:i:s", $params["start_time"]);
             $end_time                = date("Y-m-d H:i:s", $params["end_time"]);
+
+            $time = strtotime($end_time) - strtotime($start_time);
+            if ($time > 1296000 || $time < 0) {
+                return $this->response(101, '搜索时间不能大于15天');
+            }
             $where_["f.create_time"] = array( 'between', array( $start_time, $end_time ) );
         }
 

application/index/controller/Remark.php

@@ -182,6 +182,13 @@ class Remark extends Basic
             return view('remark_follow_index');
         }
 
+        if (!empty($this->params['start_date']) || !empty($this->params['end_date'])) {
+            $time = strtotime($this->params['end_date']) - strtotime($this->params['start_date']);
+            if ($time > 1296000 || $time < 0) {
+                return $this->response(101, '搜索时间不能大于15天');
+            }
+        }
+
         $m_user = new Users();
         $m_agent  = new AAgents();