From d6d0625943d216343640ac9aca2979e833c738b4 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 16 Nov 2023 11:08:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E5=B8=82=E7=BA=A7=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E9=93=BE=E5=95=86=E6=88=B7=E5=9B=BA=E5=AE=9A=E7=94=B1?=
 =?UTF-8?q?=E6=B3=B8=E5=B7=9E=E5=B8=82=E6=B5=B7=E4=B9=8B=E5=86=9C=E7=A7=91?=
 =?UTF-8?q?=E6=8A=80=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index c3b1c969d..ffb797efe 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -390,6 +390,11 @@ class CompanyController extends BaseAdminController
 
             // 根据street码查询所属镇农科公司
             $company_select=Db::query("select * from la_company where company_type=:company_type and FIND_IN_SET(:street,responsible_area)", ['company_type' => 41,'street'=>$params['street']], true);
+            // 市级供应链直接和海之农签约
+            if (isset($params['type_id']) && $params['type_id'] == 12) {
+                $company_select = Company::where(['company_name' => '泸州市海之农科技有限公司'])->find();
+            }
+
             if(empty($company_select)) {
                 throw new Exception('当前区域无镇农科公司');
             }

From 91bc6676cef31eb537152b1e9ac6892a42c5bcc5 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 16 Nov 2023 11:23:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E5=B8=82=E7=BA=A7=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E9=93=BE=E5=95=86=E6=88=B7=E5=9B=BA=E5=AE=9A=E7=94=B1?=
 =?UTF-8?q?=E6=B3=B8=E5=B7=9E=E5=B8=82=E6=B5=B7=E4=B9=8B=E5=86=9C=E7=A7=91?=
 =?UTF-8?q?=E6=8A=80=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 90894ad1d..485f8c862 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -725,6 +725,7 @@ class TaskController extends BaseApiController
             $extend = json_decode($task->extend, true);
             $extend['is_commit'] = 1;
             $extend['annex'] = $parmas['annex'];
+            $extend['file_type'] = $parmas['file_type'];
             $extend['amount'] = $parmas['amount'];
 
             Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time(), 'director_uid' => $this->userId]); // director_uid 指派人