diff --git a/app/adminapi/controller/works/bgsp/OaApproveController.php b/app/adminapi/controller/works/bgsp/OaApproveController.php index 3b3da29d7..a1ec138e5 100644 --- a/app/adminapi/controller/works/bgsp/OaApproveController.php +++ b/app/adminapi/controller/works/bgsp/OaApproveController.php @@ -479,7 +479,7 @@ $page_no = !empty($params['page_no']) ? $params['page_no'] : 1; $page_size = !empty($params['page_size']) ? $params['page_size'] : 15; - $list = Db::name('oa_approve') + $lists = Db::name('oa_approve') ->field('f.*,a.name,d.name as department_name,t.title as flow_type') ->alias('f') ->join('admin a', 'a.id = f.admin_id', 'left') @@ -505,7 +505,7 @@ ->join('dept d', 'd.id = a.dept_id', 'left') ->join('oa_flow_type t', 't.id = f.type', 'left') ->where($map)->count(); - return $this->success('成功', compact('count', 'list', 'page_no', 'page_size')); + return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size')); } public function lst(){ @@ -520,10 +520,10 @@ $page_no = !empty($params['page_no']) ? $params['page_no'] : 1; $page_size = !empty($params['page_size']) ? $params['page_size'] : 15; - $list = []; + $lists = []; $count = 0; if($status == 0){ - $list = Db::name('oa_approve') + $lists = Db::name('oa_approve') ->field('f.*,a.name,d.name as department_name,t.title as flow_type') ->alias('f') ->join('admin a', 'a.id = f.admin_id', 'left') @@ -552,7 +552,7 @@ } if($status == 1){ - $list = Db::name('oa_approve') + $lists = Db::name('oa_approve') ->field('f.*,a.name,d.name as department_name,t.title as flow_type') ->alias('f') ->join('admin a', 'a.id = f.admin_id', 'left') @@ -580,7 +580,7 @@ ->where($map1)->count(); } if($status == 2){ - $list = Db::name('oa_approve') + $lists = Db::name('oa_approve') ->field('f.*,a.name,d.name as department_name,t.title as flow_type') ->alias('f') ->join('admin a', 'a.id = f.admin_id', 'left') @@ -607,7 +607,7 @@ ->join('oa_flow_type t', 't.id = f.type', 'left') ->where($map2)->count(); } - return $this->success('成功', compact('count', 'list', 'page_no', 'page_size')); + return $this->success('成功', compact('count', 'lists', 'page_no', 'page_size')); } } \ No newline at end of file