From d0e2b35320e292de768d8757bb6b25196446ea5f Mon Sep 17 00:00:00 2001
From: hawind <fvzone@qq.com>
Date: Tue, 25 May 2021 21:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=84=8F=E8=A7=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Index/Controllers/WorkflowController.php  |  4 +-
 app/Gdoo/Model/Form.php                       | 38 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/Gdoo/Index/Controllers/WorkflowController.php b/app/Gdoo/Index/Controllers/WorkflowController.php
index 7bfacbbb..3ca66b7a 100644
--- a/app/Gdoo/Index/Controllers/WorkflowController.php
+++ b/app/Gdoo/Index/Controllers/WorkflowController.php
@@ -126,9 +126,7 @@ class WorkflowController extends DefaultController
                     }
                 }
             } else {
-                if ($gets['remark'] != '') {
-                    $gets['step_remark'][$step_id] = $gets['remark'];
-                }
+                $gets['step_remark'][$step_id] = $gets['remark'];
             }
 
             // 转到步骤条件检查
diff --git a/app/Gdoo/Model/Form.php b/app/Gdoo/Model/Form.php
index f2328487..fde7f0b0 100644
--- a/app/Gdoo/Model/Form.php
+++ b/app/Gdoo/Model/Form.php
@@ -2138,25 +2138,6 @@ class Form
 
             if ($terminate == true) {
 
-                // 更新表单的流程意见
-                $step_remark = $gets['step_remark'];
-                if (not_empty($step_remark)) {
-                    foreach ($step_remark as $step_id => $remark) {
-
-                        // 审核操作无审核意见
-                        if ($remark == '') {
-                            $remark = $gets['step_next_type'] == 'back' ? '退回' : '同意';
-                        }
-
-                        RunStep::where('run_id', $run_id)->where('step_id', $step_id)->update([
-                            'run_remark' => $remark,
-                            'run_updated_id' => $auth['id'],
-                            'run_updated_by' => $auth['name'],
-                            'run_updated_at' => time(),
-                        ]);
-                    }
-                }
-
                 // 更新主表
                 if ($id) {
                     DB::table($table)->where('id', $id)->update($master);
@@ -2591,6 +2572,25 @@ class Form
                 DB::table('model_run_log')->whereIn('id', $step_back_inform)->delete();
             }
 
+            // 更新表单的流程意见
+            $step_remark = $gets['step_remark'];
+            if (not_empty($step_remark)) {
+                foreach ($step_remark as $step_id => $remark) {
+
+                    // 审核操作无审核意见
+                    if ($remark == '') {
+                        $remark = $gets['step_next_type'] == 'back' ? '退回' : '同意';
+                    }
+
+                    RunStep::where('run_id', $run_id)->where('step_id', $step_id)->update([
+                        'run_remark' => $remark,
+                        'run_updated_id' => $auth['id'],
+                        'run_updated_by' => $auth['name'],
+                        'run_updated_at' => time(),
+                    ]);
+                }
+            }
+
             // 更新办理序号
             $_run['index'] = $run_index;