修改

app/Model/Draft.php

@@ -19,6 +19,6 @@ class Draft extends DataScopeBaseModel
      */
     protected $casts = [
         'content' => 'array', // 声明 content 字段读取时自动转为数组
-        'user' => 'array', // 声明 content 字段读取时自动转为数组
+        'opt_user' => 'array', // 声明 content 字段读取时自动转为数组
     ];
 }

app/Service/WorkFlowService.php

@@ -325,10 +325,10 @@ class WorkFlowService extends Service
     }
 
     public function approval($data, $user){
-        list($status, $msg, $result) = $this->approve($data, $user);
-        if(! $status) return [false, $msg];
-//        $result = 1;
-//        $msg = 16;
+//        list($status, $msg, $result) = $this->approve($data, $user);
+//        if(! $status) return [false, $msg];
+        $result = 1;
+        $msg = 16;
 
         if($result == 1 || $result == 2){
             $instance_id = $msg;
@@ -343,8 +343,9 @@ class WorkFlowService extends Service
         if(empty($w)) return;
         $w = $w->toArray();
 
-        $draft = Draft::where('del_time',0)
-            ->where('document_type', $w['document_type'])
+        //where('del_time',0)
+        //            ->
+        $draft = Draft::where('document_type', $w['document_type'])
             ->where('document_id', $w['document_id'])
             ->where('top_depart_id', $w['top_depart_id'])
             ->latest()
@@ -355,16 +356,19 @@ class WorkFlowService extends Service
                 if($draft_array['opt_type'] == 1){
                     //调用编辑接口 覆盖数据
                     if($draft_array['document_type'] == 'item'){
-                        (new ItemService())->itemEditSave($draft_array['content'], $draft_array['opt_user']);
+                        list($status, $msg) = (new ItemService())->itemEditSave($draft_array['content'], $draft_array['opt_user']);
                     }elseif ($draft_array['document_type'] == 'item_node'){
-                        (new ItemService())->itemNodeEditSave($draft_array['content'], $draft_array['opt_user']);
+                        list($status, $msg) = (new ItemService())->itemNodeEditSave($draft_array['content'], $draft_array['opt_user']);
                     }elseif ($draft_array['document_type'] == 'item_node_mission'){
-                        (new ItemService())->itemNodeMissionEditSave($draft_array['content'], $draft_array['opt_user']);
+                        list($status, $msg) = (new ItemService())->itemNodeMissionEditSave($draft_array['content'], $draft_array['opt_user']);
                     }
                 }else{
                     //单纯更新某个字段
                 }
             }
+            if(! $status) {
+                //todo 回滚---;
+            }
         }
 
         //通过驳回都要把源业务数据的审批中标识更新掉 目前只有审核中 和 无