新增搜索
This commit is contained in:
@@ -17,4 +17,9 @@ trait UserSearch
|
|||||||
{
|
{
|
||||||
return $query->where($this->aliasField('status'), $value);
|
return $query->where($this->aliasField('status'), $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function searchDepartmentIdAttr($query, $value, $data)
|
||||||
|
{
|
||||||
|
return $query->where($this->aliasField('department_id'), $value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -4,6 +4,7 @@ namespace catchAdmin\user\model;
|
|||||||
use catchAdmin\permissions\model\Department;
|
use catchAdmin\permissions\model\Department;
|
||||||
use catchAdmin\permissions\model\HasJobsTrait;
|
use catchAdmin\permissions\model\HasJobsTrait;
|
||||||
use catchAdmin\permissions\model\HasRolesTrait;
|
use catchAdmin\permissions\model\HasRolesTrait;
|
||||||
|
use catchAdmin\permissions\model\Permissions;
|
||||||
use catcher\base\CatchModel;
|
use catcher\base\CatchModel;
|
||||||
|
|
||||||
class Users extends CatchModel
|
class Users extends CatchModel
|
||||||
@@ -71,6 +72,11 @@ class Users extends CatchModel
|
|||||||
*/
|
*/
|
||||||
public function getPermissionsBy($uid = 0): array
|
public function getPermissionsBy($uid = 0): array
|
||||||
{
|
{
|
||||||
|
// 获取超级管理配置 超级管理员全部权限
|
||||||
|
if ($uid == config('catch.permissions.super_user_id')) {
|
||||||
|
return Permissions::select()->column('id');
|
||||||
|
}
|
||||||
|
|
||||||
$roles = $uid ? $this->findBy($uid)->getRoles() : $this->getRoles();
|
$roles = $uid ? $this->findBy($uid)->getRoles() : $this->getRoles();
|
||||||
|
|
||||||
$permissionIds = [];
|
$permissionIds = [];
|
||||||
|
Reference in New Issue
Block a user