From 8ccaecceb9bdbc7661d7b46361661b6f3f9da67c Mon Sep 17 00:00:00 2001
From: chan <709206448@qq.com>
Date: Mon, 11 Dec 2023 14:23:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=95=87=E5=90=88=E4=BC=99=E4=BA=BA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task_template/TaskTemplateController.php  | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/controller/task_template/TaskTemplateController.php b/app/adminapi/controller/task_template/TaskTemplateController.php
index a90c397ea..070dabe1d 100644
--- a/app/adminapi/controller/task_template/TaskTemplateController.php
+++ b/app/adminapi/controller/task_template/TaskTemplateController.php
@@ -105,7 +105,7 @@ class TaskTemplateController extends BaseAdminController
         $params = (new TaskTemplateValidate())->post()->goCheck('delete');
         $task = Task::where(['template_id' =>$params['id']])->whereDay('start_time', 'today')->find();
         if(!empty($task)) {
-            $this->fail('该任务今天已在进行中，无法删除');
+           return $this->fail('该任务今天已在进行中，无法删除');
         }
         TaskTemplateLogic::delete($params);
         return $this->success('删除成功', [], 1, 1);
@@ -140,4 +140,28 @@ class TaskTemplateController extends BaseAdminController
         ];
         return $this->data($data);
     }
+
+    public function checkRole()
+    {
+        $params = $this->request->param();
+        if ($params['task_role'] == 1) {
+            $serviceManagerUser = (new User())->searchMaster($params['company_id']);
+            if (empty($serviceManagerUser)) {
+                return $this->fail('公司还没有负责人，无法指派任务');
+            }
+        }
+        if ($params['task_role'] == 2) {
+            $serviceManagerUser = (new User())->searchMarketingManager($params['company_id']);
+            if (empty($serviceManagerUser)) {
+                return $this->fail('公司还没有市场部长，无法指派任务');
+            }
+        }
+
+        if ($params['task_role'] == 3) {
+            $serviceManagerUser = (new User())->searchServiceManager($params['company_id']);
+            if (empty($serviceManagerUser)) {
+                return $this->fail('公司还没有服务部长，无法指派任务');
+            }
+        }
+    }
 }
\ No newline at end of file

From f77339f949a480401429bbe6ed2584843d0ee269 Mon Sep 17 00:00:00 2001
From: chan <709206448@qq.com>
Date: Mon, 11 Dec 2023 15:14:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/task_template/TaskTemplateController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/adminapi/controller/task_template/TaskTemplateController.php b/app/adminapi/controller/task_template/TaskTemplateController.php
index 070dabe1d..b94dc0f4e 100644
--- a/app/adminapi/controller/task_template/TaskTemplateController.php
+++ b/app/adminapi/controller/task_template/TaskTemplateController.php
@@ -163,5 +163,6 @@ class TaskTemplateController extends BaseAdminController
                 return $this->fail('公司还没有服务部长，无法指派任务');
             }
         }
+        return $this->success('成功');
     }
 }
\ No newline at end of file