作者 lyh

gx

@@ -32,7 +32,7 @@ class InquiryForwardController extends BaseController @@ -32,7 +32,7 @@ class InquiryForwardController extends BaseController
32 $this->map['message'] = ['like', '%' . $this->map['message'] . '%']; 32 $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
33 } 33 }
34 if (isset($this->param['start_date']) && isset($this->param['end_date'])) { 34 if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
35 - $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 23:59:59']]; 35 + $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 00:00:00']];
36 unset($this->map['start_date']); 36 unset($this->map['start_date']);
37 unset($this->map['end_date']); 37 unset($this->map['end_date']);
38 } elseif (isset($this->param['start_date'])) { 38 } elseif (isset($this->param['start_date'])) {
@@ -138,7 +138,6 @@ class CustomTemplateLogic extends BaseLogic @@ -138,7 +138,6 @@ class CustomTemplateLogic extends BaseLogic
138 $condition['source'] = $this->getType(BTemplate::COMMON_FOOTER); 138 $condition['source'] = $this->getType(BTemplate::COMMON_FOOTER);
139 $footerComInfo = $bTemplateComModel->read($condition); 139 $footerComInfo = $bTemplateComModel->read($condition);
140 if($footerComInfo === false){ 140 if($footerComInfo === false){
141 - $template_id = $this->getTemplateId();  
142 //取默认首页的 141 //取默认首页的
143 $condition['source'] = BTemplate::SOURCE_COM; 142 $condition['source'] = BTemplate::SOURCE_COM;
144 $footerComInfo = $bTemplateComModel->read($condition); 143 $footerComInfo = $bTemplateComModel->read($condition);