|
@@ -33,11 +33,12 @@ class User extends BaseController
|
|
|
$list=[];
|
|
|
foreach($data['data']['list'] as $key=>$value){
|
|
|
$role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$value['id'])
|
|
|
- ->field("roleid,role_name")->find();
|
|
|
+ ->field("roleid,role_name,a.status")->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']="";
|
|
|
+ $value['status']=isset($role['status'])?0:$role['status'];
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("id,name,depart_link");
|
|
|
$value['depart_code'] = [];
|
|
@@ -179,11 +180,12 @@ class User extends BaseController
|
|
|
$list=[];
|
|
|
foreach ($data as $value){
|
|
|
$role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$value['id'])
|
|
|
- ->field("roleid,role_name")->find();
|
|
|
+ ->field("roleid,role_name,a.status")->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']="";
|
|
|
+ $value['status']=isset($role['status'])?0:$role['status'];
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
|
|
|
->select()->toArray();
|