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 2020-02-24 22:13:58 +08:00
parent b9839c2cef
commit 8062998e33
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,32 +56,24 @@ class Project extends BasicApi
$orgCode = getCurrentOrganizationCode(); $orgCode = getCurrentOrganizationCode();
if ($type == 'my' || $type == 'other') { if ($type == 'my' || $type == 'other') {
$sql = "select * from {$prefix}project as pp join {$prefix}project_member as pm on pm.project_code = pp.code where pp.organization_code = '{$orgCode}' and (pm.member_code = '{$memberCode}' or pp.private = 0) group by pp.`code` order by pp.id desc"; $sql = "select * from {$prefix}project as pp left join {$prefix}project_member as pm on pm.project_code = pp.code where pp.organization_code = '{$orgCode}' and (pm.member_code = '{$memberCode}' or pp.private = 0)";
$list = CommonModel::limitByQuery($sql, $page, $pageSize);
} else { } else {
$sql = "select * from {$prefix}project as pp join {$prefix}project_collection as pc on pc.project_code = pp.code where pp.organization_code = '{$orgCode}' and pc.member_code = '{$memberCode}' group by pp.`code` order by pc.id desc"; $sql = "select * from {$prefix}project as pp left join {$prefix}project_collection as pc on pc.project_code = pp.code where pp.organization_code = '{$orgCode}' and pc.member_code = '{$memberCode}'";
$list = CommonModel::limitByQuery($sql, $page, $pageSize);
} }
if ($type != 'other') {
$sql .= " and pp.deleted = 0";
}
if (isset($data['archive'])) {
$sql .= " and pp.archive = 1";
}
if (isset($data['recycle'])) {
$sql .= " and pp.deleted = 1";
}
$sql .= " group by pp.`code` order by pp.id desc";
$list = CommonModel::limitByQuery($sql, $page, $pageSize);
$newList = []; $newList = [];
if ($list['list']) { if ($list['list']) {
foreach ($list['list'] as $key => &$item) { foreach ($list['list'] as $key => &$item) {
$delete = false;
if ($type != 'other') {
if ($item['deleted']) {
$delete = true;
}
}
if (isset($data['archive']) && !$item['archive']) {
$delete = true;
}
if (isset($data['recycle']) && !$item['deleted']) {
$delete = true;
}
if ($delete) {
continue;
}
$item['collected'] = 0; $item['collected'] = 0;
$item['owner_name'] = '-'; $item['owner_name'] = '-';
$collected = ProjectCollection::where(['project_code' => $item['code'], 'member_code' => $currentMember['code']])->field('id')->find(); $collected = ProjectCollection::where(['project_code' => $item['code'], 'member_code' => $currentMember['code']])->field('id')->find();