|
|
@@ -102,7 +102,7 @@ class User extends BaseController{
|
|
|
->where(["uid"=>$value['id'],"a.companyNo"=>$value['companyCode'],"is_del"=>0])
|
|
|
->field("role_name,roleid,a.status,b.level")->findOrEmpty();
|
|
|
$value['roleid']=$roleArr['roleid']??"";
|
|
|
- $value['status']=$roleArr['status']??"";
|
|
|
+ $value['status']=$roleArr['status']?? ($value['status']??0);
|
|
|
$value["role_name"] =$roleArr['role_name']??"";
|
|
|
$value["role_level"] =$roleArr['level']??"";
|
|
|
$list[]=$value;
|
