add

app/admin/controller/Role.php

@@ -13,16 +13,16 @@ class Role extends BaseController
     {
         parent::__construct($app);
         $post  =$this->request->post();
-//        $token = isset($post['token']) ? trim($post['token']) : "";
-//        if($token==""){
-//            return error_show(101,'token不能为空');
-//
-//        }
-//        $effetc = VerifyTokens($token);
-//        if(!empty($effetc) && $effetc['code']!=0){
-//            return error_show($effetc['code'],$effetc['message']);
-//
-//        }
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+
+        }
     }
 
     /**

app/admin/controller/User.php

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

app/admin/route/app.php

@@ -61,7 +61,7 @@ Route::rule('iuserdel','admin/Departuser/userdel');
 
 Route::rule('userlist', 'admin/User/list');
 Route::rule('userinfo', 'admin/User/userInfo');
-Route::rule('userall', 'admin/User/userList');
+Route::rule('userall', 'admin/User/userAll');
 Route::rule("userstatus","admin/User/UserStatus");
 Route::rule("usersave","admin/User/UserSave");
 Route::rule("passset","admin/User/setPwd");