合并分支 'lyh-server' 到 'master'

gx询盘中心搜索



查看合并请求 !1792

@@ -32,7 +32,7 @@ class InquiryForwardController extends BaseController
             $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
             $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
         }
         }
         if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
         if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
-            $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 23:59:59']];
+            $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 00:00:00']];
             unset($this->map['start_date']);
             unset($this->map['start_date']);
             unset($this->map['end_date']);
             unset($this->map['end_date']);
         } elseif (isset($this->param['start_date'])) {
         } elseif (isset($this->param['start_date'])) {

@@ -138,7 +138,6 @@ class CustomTemplateLogic extends BaseLogic
         $condition['source'] = $this->getType(BTemplate::COMMON_FOOTER);
         $condition['source'] = $this->getType(BTemplate::COMMON_FOOTER);
         $footerComInfo = $bTemplateComModel->read($condition);
         $footerComInfo = $bTemplateComModel->read($condition);
         if($footerComInfo === false){
         if($footerComInfo === false){
-            $template_id = $this->getTemplateId();
             //取默认首页的
             //取默认首页的
             $condition['source'] = BTemplate::SOURCE_COM;
             $condition['source'] = BTemplate::SOURCE_COM;
             $footerComInfo = $bTemplateComModel->read($condition);
             $footerComInfo = $bTemplateComModel->read($condition);