Merge branch 'stable' into liuzj-1000979-dev

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')
@@ -87,6 +87,7 @@ class BankAccountController extends CatchController
         $businessId = $request->input('business_id');
         $createStartAt = $request->input('create_start_at');
         $createEndAt = $request->input('create_end_at');
+        $nameOfPayee =  $request->input('name_of_payee');
         $bankCards = DB::table('bank_cards')
             ->where([
                 'company_uid' => $company_uid
@@ -99,13 +100,20 @@ class BankAccountController extends CatchController
                 return $query->where('created_at', '>=', $createStartAt);
             })->when($createEndAt, function ($query, $createEndAt){
                 return $query->where('created_at', '<=', $createEndAt . ' 23:59:59');
+            })->when($nameOfPayee,function ($query,  $nameOfPayee){
+                return $query->where('name_of_payee', 'like', '%'. $nameOfPayee . '%');
             })
             ->orderBy('id', 'desc')
             ->paginate($request->input('limit', 15));
         $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;