ad

app/admin/controller/Payment.php

@@ -62,10 +62,10 @@ class Payment extends BaseController
         }
 
         if($supplierNo!=""){
-            $condition.=" and `a`.`supplierNo` = '$supplierNo'";
+            $condition.=" and `a`.`supplierNo` = '$companyNo'";
         }
         if($companyNo!=""){
-            $condition.=" and `a`.`companyNo` = '$companyNo'";
+            $condition.=" and (`a`.`companyNo` = '$companyNo' or `a`.`supplierNo` = '$companyNo')";
         }
         $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
          if($relaComNo!=""){
@@ -178,7 +178,7 @@ class Payment extends BaseController
         }
          $companyNo =  isset($post['companyNo'])&&$post['companyNo']!=''?trim($post['companyNo']):'';
         if($companyNo!==''){
-            $condition[]=["companyNo","=",$companyNo];
+            $condition[]=["companyNo|supplierNo","=",$companyNo];
         }
         $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
          if($relaComNo!=""){
@@ -811,7 +811,7 @@ class Payment extends BaseController
         }
         $companyNo = isset($post['companyNo']) && $post['companyNo']!='' ? trim($post['companyNo']) :"";
         if($companyNo!=""){
-          $condition []=["companyNo","=",$companyNo];
+          $condition []=["companyNo|supplierNo","=",$companyNo];
         }
          $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
          if($relaComNo!=""){
@@ -1157,16 +1157,16 @@ class Payment extends BaseController
         }
         $companyNo = isset($post['companyNo'])&&$post['companyNo']!='' ? trim($post['companyNo']):"";
         if($companyNo!=""){
-        	 $condition[]=["b.companyNo","=",$companyNo];
+        	 $condition[]=["b.companyNo|b.supplierNo","=",$companyNo];
         }
           $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
          if($relaComNo!=""){
             $condition[]=["b.companyNo|b.supplierNo","=",$relaComNo];
         }
-        $supplierNo = isset($post['supplierNo'])&&$post['supplierNo']!='' ? trim($post['supplierNo']):"";
-        if($supplierNo!=""){
-        	 $condition[]=["b.supplierNo","=",$supplierNo];
-        }
+//        $supplierNo = isset($post['supplierNo'])&&$post['supplierNo']!='' ? trim($post['supplierNo']):"";
+//        if($supplierNo!=""){
+//        	 $condition[]=["b.supplierNo","=",$supplierNo];
+//        }
         $hpNo = isset($post['hpNo'])&&$post['hpNo']!='' ? trim($post['hpNo']):"";
         if ($hpNo!=''){
             $condition[]=["a.hpNo","like","%$hpNo%"];