diff --git a/app/adminapi/lists/jxgl/OaSelfExamineLists.php b/app/adminapi/lists/jxgl/OaSelfExamineLists.php index 1d98e951a..f977fdf03 100644 --- a/app/adminapi/lists/jxgl/OaSelfExamineLists.php +++ b/app/adminapi/lists/jxgl/OaSelfExamineLists.php @@ -43,7 +43,7 @@ class OaSelfExamineLists extends BaseAdminDataLists implements ListsSearchInterf public function setSearch(): array { return [ - '=' => ['examine_type','user_id'], + '=' => ['examine_type'], ]; } @@ -63,7 +63,12 @@ class OaSelfExamineLists extends BaseAdminDataLists implements ListsSearchInterf if(!empty($params['examine_month'])){ $this->where[] = ['examine_month','=',strtotime($params['examine_month'])]; } - return OaSelfExamine::withoutField('update_time,delete_time')->where('user_id',$this->adminId)->where($this->searchWhere)->where($this->where) + if(!empty($params['user_id'])){ + $this->where[] = ['user_id','=',$params['user_id']]; + }else{ + $this->where[] = ['user_id','=',$this->adminId]; + } + return OaSelfExamine::withoutField('update_time,delete_time')->where($this->searchWhere)->where($this->where) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ @@ -85,7 +90,7 @@ class OaSelfExamineLists extends BaseAdminDataLists implements ListsSearchInterf */ public function count(): int { - return OaSelfExamine::where('user_id',$this->adminId)->where($this->searchWhere)->where($this->where)->count(); + return OaSelfExamine::where($this->searchWhere)->where($this->where)->count(); } } \ No newline at end of file