ad

app/admin/model/UserRole.php

@@ -16,6 +16,7 @@ class UserRole extends Model
 	    return self::where([
 	        'uid' => $uid,
 	        'companyNo' => $companyNo,
+	        'status' => 1,
 	        'is_del' => 0])
 	        ->value('roleid','');
     }

app/cxinv/controller/Base.php

@@ -37,7 +37,7 @@ class Base extends BaseController
    	  $this->roleid =1;
    	  if($User->level==2){
    	  	$this->roleid = \app\admin\model\UserRole::GetRoleIdByCompnyNoAndUid($reLaNo,$User->id);
-   	  	if($this->roleid==='') throw new \Exception( '没有该公司的角色',101);
+   	  	if($this->roleid==='') throw new \Exception( '没有该公司的角色或角色已禁用',10000);
    	   }
    }
 }

app/cxinv/controller/Trade.php

@@ -1,10 +1,16 @@
 <?php
 
-
 namespace app\cxinv\controller;
 
-
-use app\cxinv\model\Assoc;use app\cxinv\model\ComonOrder;use app\cxinv\model\QrdInfo;use app\cxinv\model\TradePool;use app\cxinv\model\TradeReturn;use app\user\model\Business;use think\App;use think\Exception;use think\facade\Validate;use think\helper\Str;
+use app\cxinv\model\Assoc;
+use app\cxinv\model\ComonOrder;
+use app\cxinv\model\QrdInfo;
+use app\cxinv\model\TradePool;
+use app\cxinv\model\TradeReturn;
+use app\user\model\Business;
+use think\App;
+use think\facade\Validate;
+use think\helper\Str;
 class Trade extends Base{
     public function __construct(App $app) {
         parent::__construct($app);
@@ -123,11 +129,11 @@ class Trade extends Base{
     }
 
     public function list(){
-        $params = $this->request->param(["tradNo"=>"","status"=>"","name"=>"","bank"=>"","start"=>"","end"=>"","companyNo"=>"",
+        $params = $this->request->param(["tradNo"=>"","status"=>[],"name"=>"","bank"=>"","start"=>"","end"=>"","companyNo"=>"",
         "page"=>1,"size"=>20,'userd_lower'=>"",'used_upper'=>'','total_lower'=>'','total_upper'=>'',"relaComNo"=>""],"post","trim");
         $where=[["is_del","=",0]];
         if($params['tradNo']!=="")$where[]=["tradNo","like","%".$params['tradNo']."%"];
-        if($params['status']!=="")$where[]=["status","=",$params['status']];
+        if($params['status']!=="")$where[]=["status","in",$params['status']];
         if($params['name']!=="")$where[]=["trade_out","like","%".$params['name']."%"];
         if($params['bank']!=="")$where[]=["trade_bank","like","%".$params['bank']."%"];
         if($params['start']!=="") $where[]=["trade_time",">=",startTime($params['start'])];