From 998f9c7064be0cb8640167f0c6b9fd85c3ec32b8 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Mon, 18 Feb 2019 13:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=92=E6=A1=A3=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8E=E9=A6=96=E9=A1=B5=E4=BB=8D=E7=84=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vilson <545522390@qq.com>
---
 application/common/Model/Project.php       | 4 ++--
 application/project/controller/Project.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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;