From 1c80c028ad74107fd1817ee8eccf049e514569c9 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 13 Jan 2024 09:37:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/Model/TaskStages.php       | 2 +-
 application/project/controller/TaskStages.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/common/Model/TaskStages.php b/application/common/Model/TaskStages.php
index 222a7da..bb63d0c 100755
--- a/application/common/Model/TaskStages.php
+++ b/application/common/Model/TaskStages.php
@@ -81,7 +81,7 @@ class TaskStages extends CommonModel
                 $taskModel = $taskModel->where('t.create_by',$member_code);
             }else{
                 if(isset($data['type']) &&$data['type']=='copied_list'){
-                    $taskModel = $taskModel->whereFindInSet('t.copied_list', $member_code);
+                    $taskModel = $taskModel->whereRaw('find_in_set(t.copied_list ,:id) ', ['id' => $member_code]);
                 }else{
                     $taskModel = $taskModel->leftJoin('task_member tm', 't.code = tm.task_code')->where('tm.member_code', $member_code)->where('tm.is_executor', 1);
                 }
diff --git a/application/project/controller/TaskStages.php b/application/project/controller/TaskStages.php
index 12e6ea0..645bd55 100755
--- a/application/project/controller/TaskStages.php
+++ b/application/project/controller/TaskStages.php
@@ -83,7 +83,7 @@ class TaskStages extends BasicApi
             $this->error("数据解析异常");
         }
         $where[] = ['stage_code', '=', $code];
-        $data[] = ['type'=>$type];
+        $data = ['type'=>$type];
         $list = $this->model->tasks($code, 0, $done, $title, $pri, $executor, $creator, $joiner, $status, $endTime, $beginTime, $createTime, $doneTime,$data);
 //        $list = \app\common\Model\Task::alias('t')->join('member m','t.assign_to = m.code')->field()->where(['stage_code'=>$code])->select();