|
@@ -237,12 +237,12 @@ class WorkRole extends Base{
|
|
|
->field("work_user.*,workRole.role_name")
|
|
|
->findOrEmpty();
|
|
|
$item['role_name'] ='';
|
|
|
- $item['status'] =0;
|
|
|
+ $item['role_status'] =0;
|
|
|
$item['apply_name'] = '';
|
|
|
$item['usedNum']=0;
|
|
|
if($uidArr->isEmpty()==false){
|
|
|
$item['role_name'] = $uidArr->role_name??'';
|
|
|
- $item['status'] = $uidArr->status??0;
|
|
|
+ $item['role_status'] = $uidArr->status??0;
|
|
|
$item['apply_name'] = $uidArr->apply_name??'';
|
|
|
$item['usedNum'] = WorkUser::where(['role_id'=>$uidArr->role_id])->count();
|
|
|
}
|