From 75d34b1a84b00f5ec75f73e56068b52eca808b57 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 18 Nov 2023 18:25:17 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=BA=94=E7=94=A8=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php                | 2 +-
 app/common/logic/task_template/TaskTemplateLogic.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 641b4cc0f..fc1242a23 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -674,7 +674,7 @@ class TaskController extends BaseApiController
         $task = Task::where(['id'=>$param['id']])->find();
         $taskTemplate = TaskTemplate::where(['id'=>$task['template_id']])->find();
         $extend = $taskTemplate['extend'];
-        $extend['purchase_sales_info'][] = $param['purchase_sales_info'];
+        $extend['purchase_sales_info'] = $param['purchase_sales_info'];
         $taskTemplate->save(['extend'=>json_encode($extend)]);
         return $this->success('成功', []);
     }
diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php
index 4d5648872..da4499038 100644
--- a/app/common/logic/task_template/TaskTemplateLogic.php
+++ b/app/common/logic/task_template/TaskTemplateLogic.php
@@ -142,7 +142,7 @@ class TaskTemplateLogic extends BaseLogic
             } else {
                 $taskScheduleAmount = 200;
             }
-            $find=TaskTemplate::where('task_scheduling', $params['task_scheduling'])->where('company_id',$params['company_id'])->where('type',$params['type'])->field('id,types,type,money,money_two,money_three')->find();
+            $find=TaskTemplate::where('task_scheduling', $params['task_scheduling'])->where('company_id',$params['company_id'])->where('type',$params['type'])->field('id,types,type,money,money_two,money_three,extend')->find();
             if($find && $find['id']!=$params['id']&&$params['type']==$find['type']){
                 self::setError('已经有同一种任务类型了');
                 return false;
@@ -193,7 +193,7 @@ class TaskTemplateLogic extends BaseLogic
                 'types' => $params['types'],
                 'status' => $params['status'],
                 'content' => $params['content'],
-                'extend'=>json_encode($params['extend']),
+                'extend'=>json_encode(array_merge($find['extend'],$params['extend'])),
                 'stage_day_one' => $params['stage_day_one']??0,
                 'proportion_one' => $params['proportion_one']??0,
                 'stage_day_two' => $params['stage_day_two']??0,