From cceb393646bf36b1d57878f85a078a66e9fbf739 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 16 Sep 2023 10:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E5=92=8C?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 622d83b25..08f33df20 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -213,9 +213,12 @@ class TaskController extends BaseApiController
     public function other_task_detail(){
         $parmas = $this->request->param();
         $task = TaskLogic::detail($parmas);
-        $approve = Approve::where(['task_id' =>$task['id']])->find();
-        $task['approve_status'] = $approve['check_status']; //审核状态
-        $task['deny_notes'] = $approve['remark']; // 拒绝原因
+        $extend = $task['extend'];
+        if ($extend['other']['is_commit'] == 1) {
+            $approve = Approve::where(['task_id' =>$task['id']])->find();
+            $task['approve_status'] = $approve['check_status']; //审核状态
+            $task['deny_notes'] = $approve['remark']; // 拒绝原因
+        }
         return $this->success('ok', $task);
     }
 
@@ -236,6 +239,7 @@ class TaskController extends BaseApiController
 
             // 片区经理
             $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
+            dd($areaManagerId);
 
             // 创建审批任务
             $approveModel = new Approve();