From f3467e9dd85851bf2e0a631bd29f13e07c8a4b14 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Wed, 18 Oct 2023 18:00:21 +0800
Subject: [PATCH] =?UTF-8?q?add:=E4=BB=BB=E5=8A=A110=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index a11aafb1d..d1c7529eb 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -326,7 +326,7 @@ class TaskController extends BaseApiController
             $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
 
             // 没有则创建审批任务
-            $approveModel = Approve::where(['task_id' => $task['id']])->find();
+            $approveModel = Approve::where(['task_id' => $task['id']])->findOrEmpty();
             if ($approveModel->isEmpty()) {
                 $approveModel->type = Approve::APPROVE_TYPE_1;
                 $approveModel->flow_id = 1;
@@ -340,7 +340,7 @@ class TaskController extends BaseApiController
                 $approveModel->other_type = 6;
                 $approveModel->create_time = time();
                 $approveModel->update_time = time();
-                $approveModel->save();
+                $approveModel->strict(false)->save();
             } else {
                 // 有则更新状态
                 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
@@ -402,7 +402,6 @@ class TaskController extends BaseApiController
             if (empty($task)) {
                 $this->fail('任务不存在');
             }
-            Db::startTrans();
             $extend = [];
             $stage = $parmas['stage']; // 当前做的是任务第几阶段
             $extend['stage'] = $stage;
@@ -424,6 +423,7 @@ class TaskController extends BaseApiController
             // 片区经理
             $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
 
+
             // 没有则创建审批任务
             $approveModel = Approve::where(['task_id' => $task['id']])->findOrEmpty();
             if ($approveModel->isEmpty()) {
@@ -441,17 +441,14 @@ class TaskController extends BaseApiController
                 $approveModel->remark = $parmas['remark'];
                 $approveModel->create_time = time();
                 $approveModel->update_time = time();
-                $approveModel->save();
+                $approveModel->strict(false)->save();
             } else {
                 // 有则更新状态
                 $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
                 $approveModel->save();
             }
-
-            Db::commit();
             return $this->success('ok', []);
         } catch (Exception $e) {
-            Db::rollback();
             return $this->fail($e->getMessage());
         }
     }