Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan
2021-06-02 19:40:33 +08:00
parent e5e7d2d052
commit b24d1f79fa
9 changed files with 197 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Api/ProjectController.php
View File

@@ -18,6 +18,14 @@ use Request;
*/
class ProjectController extends AbstractController
{
private $projectSelect = [
'*',
'projects.id AS id',
'projects.userid AS userid',
'projects.created_at AS created_at',
'projects.updated_at AS updated_at',
];
/**
* 项目列表
*
@@ -33,7 +41,8 @@ class ProjectController extends AbstractController
$user = User::IDE($user['data']);
}
//
$list = Project::join('project_users', 'projects.id', '=', 'project_users.project_id')
$list = Project::select($this->projectSelect)
->join('project_users', 'projects.id', '=', 'project_users.project_id')
->where('project_users.userid', $user->userid)
->orderByDesc('projects.id')
->paginate(Base::getPaginate(200, 100));
@@ -62,10 +71,15 @@ class ProjectController extends AbstractController
$taskQuery->where('parent_id', 0);
}]);
}, 'projectUser'])
->select($this->projectSelect)
->join('project_users', 'projects.id', '=', 'project_users.project_id')
->where('projects.id', $project_id)
->where('project_users.userid', $user->userid)
->first();
if ($project) {
$owner_user = $project->projectUser->where('owner', 1)->first();
$project->owner_userid = $owner_user ? $owner_user->userid : 0;
}
//
return Base::retSuccess('success', $project);
}