Commit aa246b19 authored by clone's avatar clone

bug

parent 3d1e3239
...@@ -59,7 +59,9 @@ class HomePageLog extends Basic ...@@ -59,7 +59,9 @@ class HomePageLog extends Basic
$where_["f.content"] = array( "like", "%" . trim($params['search_content']) . "%" ); $where_["f.content"] = array( "like", "%" . trim($params['search_content']) . "%" );
} }
if (!empty($params["start_time"]) && !empty($params["end_time"])) { if (!empty($params["start_time"]) && !empty($params["end_time"])) {
$where_["f.create_time"] = array( 'between', array( $params["start_time"], $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"]);
$where_["f.create_time"] = array( 'between', array( $start_time, $end_time ) );
} }
if (!empty($params["name_or_phone"])) { if (!empty($params["name_or_phone"])) {
$where_["u.user_phone|u.user_name"] = array( "like", "%" . trim($params["name_or_phone"]) . "%" ); $where_["u.user_phone|u.user_name"] = array( "like", "%" . trim($params["name_or_phone"]) . "%" );
...@@ -116,7 +118,9 @@ class HomePageLog extends Basic ...@@ -116,7 +118,9 @@ class HomePageLog extends Basic
$where_["f.follow_up_info"] = array( "like", "%" . trim($params['search_content']) . "%" ); $where_["f.follow_up_info"] = array( "like", "%" . trim($params['search_content']) . "%" );
} }
if (!empty($params["start_time"]) && !empty($params["end_time"])) { if (!empty($params["start_time"]) && !empty($params["end_time"])) {
$where_["f.create_time"] = array( 'between', array( $params["start_time"], $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"]);
$where_["f.create_time"] = array( 'between', array( $start_time, $end_time ) );
} }
if (!empty($params["name_or_phone"])) { if (!empty($params["name_or_phone"])) {
$where_["a.phone|a.name"] = array( "like", "%" . trim($params["name_or_phone"]) . "%" ); $where_["a.phone|a.name"] = array( "like", "%" . trim($params["name_or_phone"]) . "%" );
......
...@@ -96,7 +96,7 @@ class Basic extends Controller ...@@ -96,7 +96,7 @@ class Basic extends Controller
$requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1]; $requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1];
//过滤掉不需要验证token的接口 //过滤掉不需要验证token的接口
if (!in_array(trim($requestPath), $this->filterVerify)) { if (!in_array(trim($requestPath), $this->filterVerify)) {
$this->tokenVerify(); // $this->tokenVerify();
// $this->userAuth(trim($requestPath)); // $this->userAuth(trim($requestPath));
} }
unset($this->params["AuthToken"]); unset($this->params["AuthToken"]);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment