上传

app/adminapi/controller/CompanyController.php

@@ -140,16 +140,18 @@ class CompanyController extends BaseAdminController
         }
         //判断是否是租赁合同
         //如果是租赁合同则必须传递租赁数量参数
-//        if($params['contract_type'] == 29) {
-//            if(empty($params['num'])){
-//                return $this->fail('缺少必要参数');
-//            }
-//        }
+        //        if($params['contract_type'] == 29) {
+        //            if(empty($params['num'])){
+        //                return $this->fail('缺少必要参数');
+        //            }
+        //        }
+        $area_manager = Company::where('id', $params['party_a'])->value('area_manager');
+        $params['area_manager'] = $area_manager;
         $params['type'] = 1;
         $params['party_b'] = $params['id'];
         unset($params['id']);
         $result = ContractLogic::initiate_contract($params);
-        if ($result['code']==1) {
+        if ($result['code'] == 1) {
             return $this->success($result['msg'], $result['data']);
         }
         return $this->fail(ContractLogic::getError());
@@ -191,7 +193,7 @@ class CompanyController extends BaseAdminController
                 'business_license' => 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/561f8202305171526091317.png', //$qualification['business_license'],
                 'master_name' => $company['master_name'],
                 'master_email' => $company['master_email'],
-                'id'=>$company['id'],
+                'id' => $company['id'],
             ];
             $res = app(JunziqianController::class)->EnterpriseCertification($data);
             if ($res->success == true) {

app/adminapi/lists/CompanyLists.php

@@ -110,7 +110,7 @@ class CompanyLists extends BaseAdminDataLists implements ListsSearchInterface
     public function list_two(): array
     {
 
-        return Company::where('company_type',30)
+        return Company::where('company_type','in',[30,16])
             ->field(['is_authentication','id', 'company_name', 'organization_code', 'city', 'area', 'street', 'company_type', 'master_name', 'master_position', 'master_phone', 'master_email', 'other_contacts', 'area_manager', 'is_contract', 'deposit', 'deposit_time', 'qualification', 'status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])