molong/sentos
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
molong
2022-10-04 15:10:37 +08:00
parent d2752116a7
commit 96319f0898
23 changed files with 338 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/services/auth/UsersService.php
View File

@@ -37,7 +37,7 @@ class UsersService{
$q->name('user_has_roles')->where($subMap)->field('uid');
}];
}
$list = Users::with(['roles'])->auth([])->where($map)->order('uid desc')->paginate($request->pageConfig)->each(function($item){
$list = Users::with(['roles', 'department'])->auth([])->where($map)->order('uid desc')->paginate($request->pageConfig)->each(function($item){
$roleId = [];
$roleName = [];
$identify = [];
@@ -60,14 +60,15 @@ class UsersService{
*/
public function createUsers($request){
$param = $request->param();
// $data = [
// 'username' => $param['username'],
// 'nickname' => $param['nickname'],
// 'department_id' => $param['department_id']
// ];
$data = [
'username' => $param['username'],
'nickname' => $param['nickname'],
'password' => $param['password'],
'department_id' => $param['department_id']
];
// $user = Users::create($data);
// return $user;
$user = Users::create($data);
return $user;
}
/**
* @title 批量导入
@@ -103,18 +104,42 @@ class UsersService{
}
public function updateUsers($request){
$param = $request->param();
$roles = isset($param['role_id']) ? $param['role_id'] : [];
$user = Users::where('uid', '=', $param['uid'])->findOrEmpty();
if(!$user->isEmpty()){
$data = [
'avatar' => $param['avatar'],
'nickname' => $param['nickname'],
'department_id' => is_array($param['department_id']) ? $param['department_id'][0] : $param['department_id'],
'manage_class' => $param['manage_class'],
];
if(isset($param['nickname']) && $param['nickname']){
$data['nickname'] = $param['nickname'];
}
if(isset($param['email']) && $param['email']){
$data['email'] = $param['email'];
}
if(isset($param['avatar']) && $param['avatar']){
$data['avatar'] = $param['avatar'];
}
if(isset($param['department_id']) && $param['department_id']){
$data['department_id'] = is_array($param['department_id']) ? end($param['department_id']) : $param['department_id'];
}
$user->save($data);
}
if(!empty($roles)){
$this->updateRoles($param['uid'], $roles); //更新角色
}
return false;
}
public function updateUserPassword($request){
$user = Users::where('uid', '=', $request->user['uid'])->findOrEmpty();
$params = $request->param();
if(!$user->isEmpty()){
if(password_verify($params['oldpassword'], $user->password)){
$user->save(['password' => $params['password']]);
}else{
throw new \think\Exception("当前密码错误！", 1);
}
}
}
/**
* @title 获取用户权限信息
*