gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 工作流列表接口用作筛选时不用传多余参数

Browse Source
This commit is contained in:
韦荣超 2022-01-25 16:28:15 +08:00
parent 8f0b5dc049
commit d91fa33330
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1615,9 +1615,13 @@ class ProjectController extends AbstractController
User::auth(); User::auth();
// //
$project_id = intval(Request::input('project_id')); $project_id = intval(Request::input('project_id'));
$is_filter = intval(Request::input('is_filter',0)); $is_filter = intval(Request::input('is_filter', 0));
// //
$project = Project::userProject($project_id, true, true, $is_filter); if ($is_filter > 0) {
$project = Project::userProject($project_id, null);
} else {
$project = Project::userProject($project_id, true, true);
}
// //
$list = ProjectFlow::with(['ProjectFlowItem'])->whereProjectId($project->id)->get(); $list = ProjectFlow::with(['ProjectFlowItem'])->whereProjectId($project->id)->get();
return Base::retSuccess('success', $list); return Base::retSuccess('success', $list);

7
app/Models/Project.php
View File

@ -355,10 +355,9 @@ class Project extends AbstractModel
* @param int $project_id * @param int $project_id
* @param null|bool $archived true:仅限未归档, false:仅限已归档, null:不限制 * @param null|bool $archived true:仅限未归档, false:仅限已归档, null:不限制
* @param null $mustOwner true:仅限项目负责人, false:仅限非项目负责人, null:不限制 * @param null $mustOwner true:仅限项目负责人, false:仅限非项目负责人, null:不限制
* @param int $is_filter 是否是用筛选列表
* @return self * @return self
*/ */
public static function userProject($project_id, $archived = true, $mustOwner = null, $is_filter = 0) public static function userProject($project_id, $archived = true, $mustOwner = null)
{ {
$project = self::authData()->where('projects.id', intval($project_id))->first(); $project = self::authData()->where('projects.id', intval($project_id))->first();
if (empty($project)) { if (empty($project)) {
@ -370,10 +369,10 @@ class Project extends AbstractModel
if ($archived === false && $project->archived_at == null) { if ($archived === false && $project->archived_at == null) {
throw new ApiException('项目未归档', [ 'project_id' => $project_id ]); throw new ApiException('项目未归档', [ 'project_id' => $project_id ]);
} }
if ($mustOwner === true && !$project->owner && $is_filter === 0) { if ($mustOwner === true && !$project->owner) {
throw new ApiException('仅限项目负责人操作', [ 'project_id' => $project_id ]); throw new ApiException('仅限项目负责人操作', [ 'project_id' => $project_id ]);
} }
if ($mustOwner === false && $project->owner && $is_filter === 0) { if ($mustOwner === false && $project->owner) {
throw new ApiException('禁止项目负责人操作', [ 'project_id' => $project_id ]); throw new ApiException('禁止项目负责人操作', [ 'project_id' => $project_id ]);
} }
return $project; return $project;