|
|
@@ -155,7 +155,7 @@ class UserCompany extends Base
|
|
|
//获取当前账号绑定公司列表
|
|
|
public function myCompanyList()
|
|
|
{
|
|
|
- $param = $this->request->only(['status' => '', 'page' => 1, 'size' => 10], 'post', 'trim');
|
|
|
+ $param = $this->request->only(['status' => '', 'page' => 1, 'size' => 10, 'companyCode' => '', 'companyName' => ''], 'post', 'trim');
|
|
|
|
|
|
$param['account_id'] = $this->uid;
|
|
|
|
|
|
@@ -168,11 +168,12 @@ class UserCompany extends Base
|
|
|
foreach ($rs['data']['list'] as &$item) {
|
|
|
$tmp = Db::name('user_role')
|
|
|
->alias('a')
|
|
|
- ->field('b.role_name')
|
|
|
+ ->field('a.roleid,b.role_name')
|
|
|
->leftJoin('role b', 'b.id=a.roleid')
|
|
|
->where(['a.uid' => $item['account_id'], 'a.is_del' => 0, 'a.companyNo' => $item['companyCode']])
|
|
|
->findOrEmpty();
|
|
|
|
|
|
+ $item['roleid'] = $tmp['roleid'] ?? '';
|
|
|
$item['role_name'] = $tmp['role_name'] ?? '';
|
|
|
}
|
|
|
}
|
