|
...
|
...
|
@@ -141,13 +141,13 @@ class ExtensionModuleController extends BaseController |
|
|
|
];
|
|
|
|
$data = [];
|
|
|
|
$moduleValueModel = new ExtensionModuleValue();
|
|
|
|
if(isset($this->param['field_id']) && isset($this->param['value'])){
|
|
|
|
if(isset($this->param['field_id']) && ($this->param['field_id'] != 0) && isset($this->param['value'])){
|
|
|
|
$uuidArr = $moduleValueModel->formatQuery(['field_id'=>$this->param['field_id'],'value'=>$this->param['value'],'module_id'=>$this->param['module_id']])->distinct()->pluck('id')->toArray();
|
|
|
|
if(!empty($uuidArr)){
|
|
|
|
$searchParam['uuid'] = ['in',$uuidArr];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(isset($this->param['start_time']) && isset($this->param['end_time'])){
|
|
|
|
if(isset($this->param['start_time']) && !empty($this->param['start_time']) && isset($this->param['end_time']) && !empty($this->param['end_time'])){
|
|
|
|
$searchParam['created_at'] = ['between',[$this->param['start_time'],$this->param['end_time']]];
|
|
|
|
}
|
|
|
|
$lists = $moduleValueModel->list($searchParam);
|
...
|
...
|
|