From 3f49569d8d4203adc15aac80d25d3db92f62d8f8 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 8 Jan 2024 13:43:36 +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 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php
index b8c0bae..55c2388 100755
--- a/application/common/Model/Task.php
+++ b/application/common/Model/Task.php
@@ -470,7 +470,7 @@ class Task extends CommonModel
 //            'content' => $comment,
 //            'type' => 'comment'
 //        ];
-        $comment='comment';
+        $comments='comment';
         if($type==1){
             $data['status']=2;
             if($task['exchange_list']){
@@ -478,18 +478,21 @@ class Task extends CommonModel
                 $task['assign_to']=$task['exchange_list'][0];
                 unset($task['exchange_list'][0]);
                 Db::name('task')->where('id',$task['id'])->update($data);
+            }else{
+                $data['status']=1;
+                Db::name('task')->where('id',$task['id'])->update($data);
             }
-            $comment='pass';
+            $comments='pass';
         }elseif($type==2){
-            $comment='reject';
+            $comments='reject';
             $data['status']=2;
             Db::name('task')->where('id',$task['id'])->update($data);
         }elseif($type==3){
-            $comment='add';
+            $comments='add';
             $data['status']=4;
             Db::name('task')->where('id',$task['id'])->update($data);
         }
-        self::taskHook(getCurrentMember()['code'], $taskCode, 'comment', '', 1, '', $comment, '', $mentions);
+        self::taskHook(getCurrentMember()['code'], $taskCode, $comments, '', 1, '', $comment, '', $mentions);
 
         return true;
 //        return ProjectLog::create($data);