ad

app/admin/controller/Role.php

@@ -167,10 +167,11 @@ class Role extends BaseController{
         * @throws \think\db\exception\ModelNotFoundException
          */
     public function roleSave(){
-        $post=$this->request->only(["roleid"=>"","role_name"=>"","relaComNo"=>"","action"=>"","action_data"=>"","private_data"=>""],"post");
+        $post=$this->request->only(["roleid"=>"","role_name"=>"","relaComNo"=>"","companyNo"=>"","action"=>"","action_data"=>"","private_data"=>""],"post");
         $valid=Validate::rule([
         	"role_name|角色名称"=>"require|max:255|min:2",
         	"relaComNo|业务公司编号"=>"max:255",
+        	"companyNo|业务公司编号"=>"max:255",
         	"action|角色权限"=>"require|array",
         	]);
          if($valid->check($post)==false)return error_show(1004,$valid->getError());
@@ -181,7 +182,12 @@ class Role extends BaseController{
           if($post['relaComNo']!=""&& $info["level"]==1){
         	  return error_show(1002,"超管权限角色不可关联业务公司");
         }
-        $vers= Db::name("role")->where([["id",'<>',$post['roleid']],["role_name","=",$post['role_name']],["companyNo","=",$post['relaComNo']]])->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","=",$companyNo]])->find();
         if($vers){
             return error_show(1002,"角色名已存在");
         }
@@ -195,7 +201,7 @@ class Role extends BaseController{
         try {
             $list = [
                 "role_name"=>$post['role_name'],
-                "companyNo"=>$post['relaComNo'],
+                "companyNo"=>$companyNo,
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'id'=>$post['roleid']
             ];