|
@@ -257,12 +257,7 @@ class WorkRole extends Base{
|
|
|
$where[]=['a.id','not in',$uidArr];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-// $list =AccountCompany::with(["accountInfo"=>["userInfo","accountItem"=>["itemName"]]])
|
|
|
-// ->withJoin(["account_info"],"left")
|
|
|
-// ->where($where)->order('id asc')
|
|
|
-// ->paginate(['list_rows'=>$param['size'],'page'=>$param['page']]);
|
|
|
+
|
|
|
$list =Account::alias("a")
|
|
|
->leftJoin("account_company b","a.id=b.account_id and b.is_del=0")
|
|
|
->where($where)
|
|
@@ -274,10 +269,9 @@ class WorkRole extends Base{
|
|
|
->where(['account_id'=>$item['account_id'],'work_user.companyNo'=>$item['companyCode'],"belong"=>$param['belong']])
|
|
|
->findOrEmpty();
|
|
|
$userinfo = Account::with(['userInfo',"accountItem"=>["itemName"]])->where(['is_del'=>0])
|
|
|
- ->visible(["nickname",'user_mobile',"openId","field_deny","depart_name","itemid","depart_link","position"])
|
|
|
->findOrEmpty($item['account_id']);
|
|
|
$item['nickname'] =$userinfo->nickname??'';
|
|
|
- $item['user_mobile'] =$userinfo->user_mobile??'';
|
|
|
+ $item['user_mobile'] =$userinfo->user_mobile??'';
|
|
|
$item['openId'] =$userinfo->openId??'';
|
|
|
$item['field_deny'] =$userinfo->field_deny??[];
|
|
|
$item['depart_name']=$userinfo->depart_name??'';
|