ad

app/admin/BaseController.php

@@ -43,8 +43,12 @@ class BaseController extends base{
             }
             $this->uid=$effetc['data']['id']??"";
             $this->uname=$effetc['data']['user']['nickname']??"";
-            $role = Db::name("user_role")->where(["uid"=>$this->uid,"companyNo"=>$companyNo,"status"=>1,"is_del"=>0])
-            ->findOrEmpty();
+            $where=[];
+            if($companyNo!=""){
+            	$where=["companyNo"=>$companyNo];
+            }
+            $role = Db::name("user_role")->where(["uid"=>$this->uid,"status"=>1,"is_del"=>0])
+            ->where($where)->findOrEmpty();
             if(empty($role)){
             	 return ["code"=>101,"message"=>"账户已禁用"];
             }

app/admin/controller/Payment.php

@@ -49,6 +49,7 @@ class Payment extends BaseController
         $endTime= isset($post['endTime'])&&$post['endTime']!="" ? trim($post['endTime']) :"";
         $supplierNo= isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
         $companyNo= isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
+        $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
         $payNo= isset($post['payNo'])&&$post['payNo']!="" ? trim($post['payNo']) :"";
         $apply= isset($post['apply_name'])&&$post['apply_name']!="" ? trim($post['apply_name']) :"";
         $paystatus= isset($post['status'])&&$post['status']!="" ? $post['status'] :"";