|
|
@@ -38,7 +38,7 @@ class User extends BaseController
|
|
|
$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'];
|
|
|
+ $value['status']=isset($role['status'])?$role['status']:0;
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("id,name,depart_link");
|
|
|
$value['depart_code'] = [];
|
|
|
@@ -87,9 +87,10 @@ class User extends BaseController
|
|
|
// $nickname = isset($to['data']['nickname']) &&$to['data']['nickname']!="" ? $to['data']['nickname'] :"" ;
|
|
|
$data = $to['data'];
|
|
|
$role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$data['id'])
|
|
|
- ->field("roleid,role_name,business_all,uid")->find();
|
|
|
+ ->field("roleid,role_name,business_all,uid,a.status")->find();
|
|
|
$data['role_name']=isset($role['role_name']) ? $role['role_name'] :"";
|
|
|
$data['roleid']=isset($role['roleid']) ? $role['roleid'] :"";
|
|
|
+ $data['status']=isset($role['status'])?$role['status']:0;
|
|
|
$st = Db::name('user_business')->where(['userid'=>$role['uid'],"is_del"=>0])->field('businessid,is_main')->select()->toArray();
|
|
|
$val=[];
|
|
|
if (!empty($st)){
|
|
|
@@ -185,7 +186,7 @@ class User extends BaseController
|
|
|
$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'];
|
|
|
+ $value['status']=isset($role['status'])?$role['status']:0;
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
|
|
|
->select()->toArray();
|
|
|
@@ -230,11 +231,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","=",$data['uid']],["is_del","=",0]])->column("itemid");
|
|
|
$value['depart']="";
|
|
|
+ $value['status']=isset($role['status'])?$role['status']:0;
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
|
|
|
->select()->toArray();
|
