diff --git a/application/common/Model/Project.php b/application/common/Model/Project.php index 369f84e..e11299d 100644 --- a/application/common/Model/Project.php +++ b/application/common/Model/Project.php @@ -23,7 +23,7 @@ class Project extends CommonModel return self::where(['id' => $id, 'deleted' => 0, 'archive' => 0])->find(); } - public function getMemberProjects($memberCode = '', $deleted = 0, $page = 1, $pageSize = 10) + public function getMemberProjects($memberCode = '', $deleted = 0, $archive = 0, $page = 1, $pageSize = 10) { if (!$memberCode) { $memberCode = getCurrentMember()['code']; @@ -34,7 +34,7 @@ class Project extends CommonModel $offset = ($page - 1) * $page; $limit = $pageSize; $prefix = config('database.prefix'); - $sql = "select *,p.id as id,p.name as name,p.code as code from {$prefix}project as p join {$prefix}project_member as pm on p.code = pm.project_code where pm.member_code = '{$memberCode}' and p.deleted = {$deleted} order by p.id desc"; + $sql = "select *,p.id as id,p.name as name,p.code as code from {$prefix}project as p join {$prefix}project_member as pm on p.code = pm.project_code where pm.member_code = '{$memberCode}' and p.deleted = {$deleted} and p.archive = {$archive} order by p.id desc"; $total = Db::query($sql); $total = count($total); $sql .= " limit {$offset},{$limit}"; diff --git a/application/project/controller/Project.php b/application/project/controller/Project.php index eff8cc4..d170afc 100644 --- a/application/project/controller/Project.php +++ b/application/project/controller/Project.php @@ -111,6 +111,7 @@ class Project extends BasicApi public function selfList() { $type = Request::post('type'); + $archive = Request::param('archive', 0); $memberCode = Request::post('memberCode', ''); if (!$memberCode) { $member = getCurrentMember(); @@ -121,7 +122,7 @@ class Project extends BasicApi if (!$type) { $deleted = 0; } - $list = $this->model->getMemberProjects($member['code'], $deleted, Request::post('page'), Request::post('pageSize')); + $list = $this->model->getMemberProjects($member['code'], $deleted, $archive, Request::post('page'), Request::post('pageSize')); if ($list['list']) { foreach ($list['list'] as $key => &$item) { $item['collected'] = false;