From 931805aa1e049fe30aaa5923d748a31ef5e72a69 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 8 Jan 2024 14:56:47 +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/Task.php | 33 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index e062c16..1b93417 100755
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -21,22 +21,6 @@ class Task extends CommonModel
 {
     protected $append = ['priText', 'statusText', 'liked', 'stared', 'tags', 'childCount', 'hasUnDone', 'parentDone', 'hasComment', 'hasSource', 'canRead'];
 
-    public function getExchangeListAttr($value)
-    {
-        if($value){
-            return explode(',',$value);
-        }else{
-            return[];
-        }
-    }
-    public function getTransferredtAttr($value)
-    {
-        if($value){
-            return explode(',',$value);
-        }else{
-            return[];
-        }
-    }
     public function read($code)
     {
         if (!$code) {
@@ -251,7 +235,7 @@ class Task extends CommonModel
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public function createTask($stageCode, $projectCode, $name, $memberCode, $assignTo = '', $parentCode = '', $pri = '', $description = '', $tagCodes = [], $beginTime = '', $endTime = '',$data)
+    public function createTask($stageCode, $projectCode, $name, $memberCode, $assignTo = '', $parentCode = '', $pri = '', $description = '', $tagCodes = [], $beginTime = '', $endTime = '',$data=[])
     {
         if (!$name) {
             return error(1, '请填写任务标题');
@@ -456,7 +440,20 @@ class Task extends CommonModel
         if (!$taskCode) {
             throw new Exception('请选择任务', 1);
         }
-        $task = self::where(['code' => $taskCode])->find();
+        $task = self::where(['code' => $taskCode])->withAttr('exchange_list', function($value) {
+            if($value){
+                return explode(',',$value);
+            }else{
+                return [];
+            }
+        })->withAttr('transferred', function($value) {
+            if($value){
+                return explode(',',$value);
+            }else{
+                return [];
+            }
+        })
+        ->find();
         if (!$task) {
             throw new Exception('任务已失效', 2);
         }