作者 lyh

gx

@@ -141,13 +141,13 @@ class ExtensionModuleController extends BaseController @@ -141,13 +141,13 @@ class ExtensionModuleController extends BaseController
141 ]; 141 ];
142 $data = []; 142 $data = [];
143 $moduleValueModel = new ExtensionModuleValue(); 143 $moduleValueModel = new ExtensionModuleValue();
144 - if(isset($this->param['field_id']) && isset($this->param['value'])){ 144 + if(isset($this->param['field_id']) && ($this->param['field_id'] != 0) && isset($this->param['value'])){
145 $uuidArr = $moduleValueModel->formatQuery(['field_id'=>$this->param['field_id'],'value'=>$this->param['value'],'module_id'=>$this->param['module_id']])->distinct()->pluck('id')->toArray(); 145 $uuidArr = $moduleValueModel->formatQuery(['field_id'=>$this->param['field_id'],'value'=>$this->param['value'],'module_id'=>$this->param['module_id']])->distinct()->pluck('id')->toArray();
146 if(!empty($uuidArr)){ 146 if(!empty($uuidArr)){
147 $searchParam['uuid'] = ['in',$uuidArr]; 147 $searchParam['uuid'] = ['in',$uuidArr];
148 } 148 }
149 } 149 }
150 - if(isset($this->param['start_time']) && isset($this->param['end_time'])){ 150 + if(isset($this->param['start_time']) && !empty($this->param['start_time']) && isset($this->param['end_time']) && !empty($this->param['end_time'])){
151 $searchParam['created_at'] = ['between',[$this->param['start_time'],$this->param['end_time']]]; 151 $searchParam['created_at'] = ['between',[$this->param['start_time'],$this->param['end_time']]];
152 } 152 }
153 $lists = $moduleValueModel->list($searchParam); 153 $lists = $moduleValueModel->list($searchParam);