ad

app/admin/controller/Payment.php

@@ -1142,6 +1142,9 @@ class Payment extends BaseController
 
     }
 
+
+
+
     /**发票列表识别
      * @param  int  $id
      * @return \think\Response

app/admin/controller/Role.php

@@ -184,12 +184,12 @@ class Role extends BaseController{
           if($post['relaComNo']!=""&& $info["level"]==1){
         	  return error_show(1002,"超管权限角色不可关联业务公司");
         }
-		if($this->level==1){
-        	$companyNo =$post['companyNo']??"";
-        }else{
-        	$companyNo =$post['relaComNo']??"";
-        }
-        $vers= Db::name("role")->where([["id",'<>',$post['roleid']],["role_name","=",$post['role_name']],["companyNo","=",$companyNo]])->find();
+//		if($this->level==1){
+//        	$companyNo =$post['companyNo']??"";
+//        }else{
+//        	$companyNo =$post['relaComNo']??"";
+//        }
+        $vers= Db::name("role")->where([["id",'<>',$post['roleid']],["role_name","=",$post['role_name']], ["companyNo","=",$info['companyNo']]])->find();
         if($vers){
             return error_show(1002,"角色名已存在");
         }
@@ -203,7 +203,6 @@ class Role extends BaseController{
         try {
             $list = [
                 "role_name"=>$post['role_name'],
-                "companyNo"=>$companyNo,
                 "level"=>$post['level'],
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'id'=>$post['roleid']