add

app/admin/controller/User.php

@@ -125,16 +125,22 @@ class User extends BaseController
             return app_show($effetc['code'],$effetc['message']);
         }
         $userinfo=GetAccountall($token,$post);
-
         if(empty($userinfo)||$userinfo['code']!=0){
             return app_show(1002,"员工信息不存在");
         }
         $data = $userinfo['data'];
-        $role = Db::name("role")->column("role_name","id");
-        $role[0]="";
         $list=[];
         foreach ($data as $value){
-            $value["role_name"] = isset($role[$value["roleid"]]) ? $role[$value["roleid"]]:"";
+            $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$value['id'])
+                ->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['id']],["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;
         }
         return app_show(0,"获取成功",$list);

app/common.php

@@ -130,7 +130,7 @@ function GetUserlist($token,$condition){
  * @param $condition
  * @return mixed
  */
-function GetAccountall($token){
+function GetAccountall($token, $condition){
     $host = Config::get("app");
 
     $url = $host["api_host"]."/Api/userall";