From d91fa3333048d84bbd93626214104a7a92659d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Tue, 25 Jan 2022 16:28:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BD=9C=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E7=94=A8=E4=BC=A0=E5=A4=9A=E4=BD=99=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php | 8 ++++++--
 app/Models/Project.php                         | 7 +++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index dda20470..ba628ce4 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1615,9 +1615,13 @@ class ProjectController extends AbstractController
         User::auth();
         //
         $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();
         return Base::retSuccess('success', $list);
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 0b1bab82..e20b94a1 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -355,10 +355,9 @@ class Project extends AbstractModel
      * @param int $project_id
      * @param null|bool $archived true:仅限未归档, false:仅限已归档, null:不限制
      * @param null $mustOwner true:仅限项目负责人, false:仅限非项目负责人, null:不限制
-     * @param int $is_filter 是否是用筛选列表
      * @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();
         if (empty($project)) {
@@ -370,10 +369,10 @@ class Project extends AbstractModel
         if ($archived === false && $project->archived_at == null) {
             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 ]);
         }
-        if ($mustOwner === false && $project->owner && $is_filter === 0) {
+        if ($mustOwner === false && $project->owner) {
             throw new ApiException('禁止项目负责人操作', [ 'project_id' => $project_id ]);
         }
         return $project;