ad

app/admin/controller/Role.php

@@ -89,14 +89,14 @@ class Role extends BaseController
         if($isCode){
             return error_show(1002,"角色编号已存在");
         }
-        $item = isset($post['item']) ? trim($post['item']) : "";
-        if($item==""){
-            return error_show(1003,"参数item 不能为空");
-        }
-        $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
-        if(empty($iteminfo) || $iteminfo['is_del']==1){
-            return error_show(1003,"该部门不存在");
-        }
+//        $item = isset($post['item']) ? trim($post['item']) : "";
+//        if($item==""){
+//            return error_show(1003,"参数item 不能为空");
+//        }
+//        $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
+//        if(empty($iteminfo) || $iteminfo['is_del']==1){
+//            return error_show(1003,"该部门不存在");
+//        }
         $level = isset($post['level']) ? intval($post['level']) : 0;
         $remark = isset($post['remark']) ? trim($post['remark']) : '';
 //        if($level==""){
@@ -124,7 +124,7 @@ class Role extends BaseController
                 "updatetime"=>date("Y-m-d H:i:s"),
                 "level"=>$level,
                 "desc"=>$remark,
-                "item"=>$item,
+                "item"=>"",
             ];
             $role= Db::name("role")->insert($list,true);
 
@@ -221,14 +221,14 @@ class Role extends BaseController
 //        if($isCode){
 //            return error_show(1002,"角色编号已存在");
 //        }
-        $item = isset($post['item']) ? trim($post['item']) : "";
-        if($item==""){
-            return error_show(1003,"参数item 不能为空");
-        }
-        $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
-        if($iteminfo['is_del']==1){
-            return error_show(1003,"该部门不存在");
-        }
+//        $item = isset($post['item']) ? trim($post['item']) : "";
+//        if($item==""){
+//            return error_show(1003,"参数item 不能为空");
+//        }
+//        $iteminfo = Db::name('company_item')->where('id',"=",$item)->find();
+//        if($iteminfo['is_del']==1){
+//            return error_show(1003,"该部门不存在");
+//        }
         $level = isset($post['level']) ? intval($post['level']) : 0;
         $remark = isset($post['remark']) ? trim($post['remark']) : '';
         $action = isset($post['action'])&&is_array($post['action']) ? implode(",",$post['action']) : "";
@@ -247,7 +247,7 @@ class Role extends BaseController
                 "level"=>$level,
                 'desc'=>$remark,
                 'role_code'=>$role_code,
-                'item'=>$item,
+                'item'=>"",
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'id'=>$roleid
             ];

app/admin/controller/User.php

@@ -68,6 +68,12 @@ class User extends BaseController
             ->field("roleid,role_name")->find();
         $data['role_name']=isset($role['role_name']) ? $role['role_name'] :"";
         $data['roleid']=isset($role['roleid']) ? $role['roleid'] :"";
+        $depart = Db::name("depart_user")->where([["uid","=",$data['uid']],["is_del","=",0]])->column("itemid");
+        $data['depart']="";
+        if(!empty($depart)){
+            $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("name");
+            $data['depart'] = implode(",",$deparname);
+        }
         return app_show(0,"获取成功",$data);
     }
     /**