ad

app/admin/controller/Menu.php

@@ -240,7 +240,7 @@ class Menu extends BaseController{
         ("a.*,action_name")->where($condition)->select();
         return app_show(0,"获取成功",$data);
     }
-        /** 菜单下功能信息修改*/
+        /** 菜单下功能信息修改*  **/
     public function ActionSave(){
         $post  =$this->post;
         $actid = isset($post['id']) ? intval($post['id']) : "";

app/admin/controller/Role.php

@@ -57,19 +57,29 @@ class Role extends BaseController{
      */
 
     public function roleAdd(){
-        $post=$this->request->only(["role_name"=>"","level"=>"","action"=>"","action_data"=>"","private_data"=>"","relaComNo"=>""],"post");
+        $post=$this->request->only(["role_name"=>"","level"=>"","action"=>"","action_data"=>"","private_data"=>"","relaComNo"=>"","companyNo"=>""],"post");
         $valid =Validate::rule([
         	"role_name|角色名称"=>"require|max:255|min:3",
         	"level|角色级别"=>"require|number|in:1,2,3",
         	"relaComNo|业务公司编号"=>"max:255|min:3",
+        	"companyNo|业务公司编号"=>"max:255|min:3",
         	"action|角色权限"=>"require|array",
         	]);
         if($valid->check($post)==false)return error_show(1004,$valid->getError());
         if($post['relaComNo']!=""&& $post["level"]==1){
         	  return error_show(1002,"超管权限角色不可关联业务公司");
         }
+        if($this->level==1){
+        	$companyNo =$post['companyNo']??"";
+        }else{
+        	$companyNo =$post['relaComNo']??"";
+        }
         $where=[["role_name","=",$post['role_name']]];
-        isset($post['relaComNo'])&&$post['relaComNo']!=""? $where[]=["companyNo","=",$post['relaComNo']]:"";
+        if($companyNo!=""){
+        	 $where[]=["companyNo","=",$companyNo];
+//        	 $company =Db::name("supplier_info")->where(["code"=>$companyNo])->find();
+        }
+
         $isT=Db::name("role")->where($where)->find();
         if($isT){
             return error_show(1002,"角色名称已存在");
@@ -82,7 +92,7 @@ class Role extends BaseController{
         try {
             $list = [
                 "role_name"=>$post['role_name'],
-                "companyNo"=>$post['relaComNo'],
+                "companyNo"=>$companyNo,
                 "status"=>1,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),