gx

@@ -136,9 +136,21 @@ class ExtensionModuleController extends BaseController
         ],[
         ],[
             'module_id.required' => '模块id不能为空',
             'module_id.required' => '模块id不能为空',
         ]);
         ]);
+        $searchParam = [
+            'module_id'=>$this->param['module_id'],
+        ];
         $data = [];
         $data = [];
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel = new ExtensionModuleValue();
-        $lists = $moduleValueModel->list(['module_id'=>$this->param['module_id']]);
+        if(isset($this->param['field_id']) && 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'])){
+            $searchParam['created_at'] = ['between',[$this->param['start_time'],$this->param['end_time']]];
+        }
+        $lists = $moduleValueModel->list($searchParam);
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
                 $data[$v['uuid']][$v['field_id']] = $v['value'];
                 $data[$v['uuid']][$v['field_id']] = $v['value'];