Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 新增获取所有用户，修复deleteAt失效问题 #143

Merged
merged 1 commit into from
Jul 11, 2024
Merged

feat: 新增获取所有用户，修复deleteAt失效问题 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/toolkits/pro/template/server/nestJs/src/user/user.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,13 @@ export class UserController {
return this.userService.deleteUser(email);
}
@Patch('/update')
@Permission('user:update')
@Permission('user::update')
async UpdateUser(@Body() body: UpdateUserDto) {
return this.userService.updateUserPwd(body);
}
@Get()
@Permission('user::query')
async getAllUser() {
return this.userService.getAllUser();
}
}
11 changes: 10 additions & 1 deletion packages/toolkits/pro/template/server/nestJs/src/user/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class UserService {
password,
name: username,
role: await roles,
deleteAt: 0,
});
return this.userRep.save(user);
} catch (err) {
Expand All @@ -46,9 +47,17 @@ export class UserService {
}
}

//获取所有用户信息
async getAllUser() {
return this.userRep.find({
where: { deleteAt: 0 },
select: ['id', 'name', 'email', 'createTime', 'updateTime'],
});
}

async getUserInfo(email: string, relations: string[] = []) {
return this.userRep.findOne({
where: { email, deleteAt: null },
where: { email, deleteAt: 0 },
select: [
'id',
'name',
Expand Down