Merge branch 'wzq-skyh' of 121.36.198.49:zy_duanju/duanju_manage into test

modules/Jiesuan/Http/Controllers/BankAccountController.php

@@ -28,15 +28,15 @@ class BankAccountController extends CatchController
             'bank_name' => 'required|string|max:128',
             'sub_bank_name' => 'required|string|max:256',
             'phone_of_payee' => 'required',
-            'business_id' => 'required',
+            // 'business_id' => 'required',
         ]);
 
         $company_uid = $this->getLoginUserId();
         $id = $request->input('id');
         $now = date('Y-m-d H:i:s');
         if($id) {
-            $data = $request->only(['owner_name', 'name_of_payee', 'card_no',
-                'bank_name', 'sub_bank_name', 'phone_of_payee', 'business_id']);
+            // $data = $request->only(['owner_name', 'name_of_payee', 'card_no','bank_name', 'sub_bank_name', 'phone_of_payee', 'business_id']);
+            $data = $request->only(['owner_name', 'name_of_payee', 'card_no','bank_name', 'sub_bank_name', 'phone_of_payee']);
             $data['updated_at'] = $now;
             // 只有待审核的允许修改 --放弃
             // DB::table('bank_cards')
@@ -105,7 +105,12 @@ class BankAccountController extends CatchController
         $businessmans = BusinessmanService::list()->keyBy('id');
         foreach ($bankCards as $bankCard) {
             $bankCard->status_str = ConstService::BANK_CARD_CHECK_STATUS[$bankCard->status] ?? '';
-            $bankCard->business_str = $businessmans->get($bankCard->business_id)->username ?? '';
+            if ($bankCard->business_id >  0){
+                $bankCard->business_str = $businessmans->get($bankCard->business_id)->username ?? '';
+            }else{
+                $bankCard->business_str = "";
+            }
+
         }
 
         return $bankCards;