ad

app/admin/controller/OrderInv.php

@@ -1564,7 +1564,7 @@ class OrderInv extends BaseController{
 					$value['SL'] = ($value['SL']*100)."%";
 			});
 		}
-		return empty($info)?error_show(1005,"为找到数据"):app_show(0,"获取成功",$info);
+		return empty($info)?error_show(1005,"未找到数据"):app_show(0,"获取成功",$info);
     }
 
 	/**

app/admin/controller/Role.php

@@ -19,7 +19,7 @@ class Role extends BaseController{
         * @throws \think\db\exception\ModelNotFoundException
         */
     public function roleList(){
-        $post=$this->request->only(["status"=>"","role_name"=>"","relaComNo"=>"","companyName"=>"","level"=>"",
+        $post=$this->request->only(["status"=>"","role_name"=>"","relaComNo"=>"","companyName"=>"","companyNo"=>"","level"=>"",
         "page"=>1,"size"=>10],"post","trim");
         $condition=[];
 
@@ -27,6 +27,7 @@ class Role extends BaseController{
         isset($post['role_name'])&&$post['role_name']!=="" ? $condition[]=['a.role_name',"like","%".$post['role_name']."%"]:"";
         isset($post['level'])&&$post['level']!=="" ? $condition[]=["a.level","=",$post['level']]:"";
         isset($post['relaComNo'])&&$post['relaComNo']!=="" ? $condition[]=["a.companyNo","=",$post['relaComNo']]:"";
+        isset($post['companyNo'])&&$post['companyNo']!=="" ? $condition[]=["a.companyNo","=",$post['companyNo']]:"";
         isset($post['companyName'])&&$post['companyName']!=="" ? $condition[]=["b.name","like","%{$post['companyName']}%"]:"";
 
         $count =Db::name("role")->alias("a")
@@ -253,9 +254,10 @@ class Role extends BaseController{
      * @throws \think\exception\DbException
      */
     public function RoleAll(){
-    	$post=$this->request->only(["relaComNo"=>""],"post","trim");
+    	$post=$this->request->only(["relaComNo"=>"","companyNo"=>""],"post","trim");
     	$where=[];
     	if(isset($post['relaComNo']))$where[]=["companyNo","=",$post['relaComNo']];
+    	if(isset($post['companyNo']))$where[]=["companyNo","=",$post['companyNo']];
         $list =Db::name("role")->alias("a")
         ->leftJoin("supplier_info b","a.companyNo=b.code")
         ->field("a.*,b.name as companyName")