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('当前区域无镇农科公司'); } 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 指派人