From 170bf379ae767698ac9e13cabf101fcfb773dcc6 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 19 Oct 2023 09:45:59 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 99aea5e31..de2b142d1 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -403,23 +403,24 @@ class TaskController extends BaseApiController
                 $this->fail('任务不存在');
             }
             $extend = [];
+            $remark = '';
             $stage = $parmas['stage']; // 当前做的是任务第几阶段
             $extend['stage'] = $stage;
             if ($stage == 1) {
                 $extend['stage1']['file'] = $parmas['stage1'];
-                $extend['stage1']['remark'] = $parmas['remark'];
+                $remark = $extend['stage1']['remark'];
             }
             if ($stage == 2) {
                 $extend['stage2']['file'] = $parmas['stage2'];
-                $extend['stage2']['remark'] = $parmas['remark'];
+                $remark = $extend['stage2']['remark'];
             }
             if ($stage == 3) {
                 $extend['stage3']['file'] = $parmas['stage3'];
-                $extend['stage3']['remark'] = $parmas['remark'];
+                $remark = $extend['stage3']['remark'];
             }
             if ($stage == 4) {
                 $extend['stage4']['file'] = $parmas['stage4'];
-                $extend['stage4']['remark'] = $parmas['remark'];
+                $remark = $extend['stage4']['remark'];
             }
 
 //            Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人
@@ -442,7 +443,7 @@ class TaskController extends BaseApiController
                 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
                 $approveModel->other_type = 6;
                 $approveModel->extend = json_encode($extend);
-                $approveModel->remark = $parmas['remark'];
+                $approveModel->remark = $remark;
                 $approveModel->create_time = time();
                 $approveModel->update_time = time();
                 $re = $approveModel->save();