From 9669614e6ba1575c9fb8e30c5a51751c742e7fcf Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 16 Sep 2023 16:33:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E7=AD=89=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 41 ++++++++++++++-------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index aab62c594..62f3f0221 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -241,27 +241,30 @@ class TaskController extends BaseApiController
             $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
 
 
-            // 创建审批任务
-            $approveModel = new Approve();
-            $approveModel->type = 1;
-            $approveModel->flow_id = 1;
-            $approveModel->name = $task['title'];
-            $approveModel->type = 1;
-            $approveModel->admin_id = 0; // 后台发起人id 暂时为0
-            $approveModel->user_id = $this->userId; // 前台发起人用户id
-            $approveModel->task_id = $task['id']; // 前台发起人用户id
-            $approveModel->department_id = '0';
-            $approveModel->check_admin_ids = $areaManagerId; // 当前审批人ID 片区经理的admin_id
-            $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
-            $approveModel->other_type = 6;
-            $approveModel->create_time = time();
-            $approveModel->update_time = time();
-
-            $approveModel->save();
-            if ($approveModel->id) {
-                Db::commit();
+            // 没有则创建审批任务
+            $approveModel = (new Approve())->find(['task_id' => $task['id']]);
+            if ($approveModel->isEmpty()) {
+                $approveModel->type = 1;
+                $approveModel->flow_id = 1;
+                $approveModel->name = $task['title'];
+                $approveModel->type = 1;
+                $approveModel->admin_id = 0; // 后台发起人id 暂时为0
+                $approveModel->user_id = $this->userId; // 前台发起人用户id
+                $approveModel->task_id = $task['id']; // 前台发起人用户id
+                $approveModel->department_id = '0';
+                $approveModel->check_admin_ids = $areaManagerId; // 当前审批人ID 片区经理的admin_id
+                $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
+                $approveModel->other_type = 6;
+                $approveModel->create_time = time();
+                $approveModel->update_time = time();
+                $approveModel->save();
+            } else {
+                // 有则更新状态
+                $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
+                $approveModel->save();
             }
 
+            Db::commit();
             return $this->success('ok', []);
         } catch (Exception $e) {
             Db::rollback();