mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复归档项目后首页仍然显示的问题

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-02-18 13:02:41 +08:00
parent 99afe11510
commit 998f9c7064
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/common/Model/Project.php
View File

@ -23,7 +23,7 @@ class Project extends CommonModel
return self::where(['id' => $id, 'deleted' => 0, 'archive' => 0])->find(); 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) { if (!$memberCode) {
$memberCode = getCurrentMember()['code']; $memberCode = getCurrentMember()['code'];
@ -34,7 +34,7 @@ class Project extends CommonModel
$offset = ($page - 1) * $page; $offset = ($page - 1) * $page;
$limit = $pageSize; $limit = $pageSize;
$prefix = config('database.prefix'); $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 = Db::query($sql);
$total = count($total); $total = count($total);
$sql .= " limit {$offset},{$limit}"; $sql .= " limit {$offset},{$limit}";

3
application/project/controller/Project.php
View File

@ -111,6 +111,7 @@ class Project extends BasicApi
public function selfList() public function selfList()
{ {
$type = Request::post('type'); $type = Request::post('type');
$archive = Request::param('archive', 0);
$memberCode = Request::post('memberCode', ''); $memberCode = Request::post('memberCode', '');
if (!$memberCode) { if (!$memberCode) {
$member = getCurrentMember(); $member = getCurrentMember();
@ -121,7 +122,7 @@ class Project extends BasicApi
if (!$type) { if (!$type) {
$deleted = 0; $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']) { if ($list['list']) {
foreach ($list['list'] as $key => &$item) { foreach ($list['list'] as $key => &$item) {
$item['collected'] = false; $item['collected'] = false;