amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix of #10145

Browse Source
This commit is contained in:
syuilo 2023-03-01 12:02:37 +09:00
parent 064a6bf065
commit 9e5278d276
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/core/entities/RoleEntityService.ts
View File

@ -32,7 +32,7 @@ export class RoleEntityService {
const assignedCount = await this.roleAssignmentsRepository.createQueryBuilder('assign') const assignedCount = await this.roleAssignmentsRepository.createQueryBuilder('assign')
.where('assign.roleId = :roleId', { roleId: role.id }) .where('assign.roleId = :roleId', { roleId: role.id })
.andWhere(new Brackets(qb => { qb .andWhere(new Brackets(qb => { qb
.where('assign.expiresAt IS NOT NULL') .where('assign.expiresAt IS NULL')
.orWhere('assign.expiresAt > :now', { now: new Date() }); .orWhere('assign.expiresAt > :now', { now: new Date() });
})) }))
.getCount(); .getCount();

2
packages/backend/src/server/api/endpoints/admin/roles/users.ts
View File

@ -58,7 +58,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
const query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId) const query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId)
.andWhere('assign.roleId = :roleId', { roleId: role.id }) .andWhere('assign.roleId = :roleId', { roleId: role.id })
.andWhere(new Brackets(qb => { qb .andWhere(new Brackets(qb => { qb
.where('assign.expiresAt IS NOT NULL') .where('assign.expiresAt IS NULL')
.orWhere('assign.expiresAt > :now', { now: new Date() }); .orWhere('assign.expiresAt > :now', { now: new Date() });
})) }))
.innerJoinAndSelect('assign.user', 'user'); .innerJoinAndSelect('assign.user', 'user');

2
packages/backend/src/server/api/endpoints/roles/users.ts
View File

@ -58,7 +58,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
const query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId) const query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId)
.andWhere('assign.roleId = :roleId', { roleId: role.id }) .andWhere('assign.roleId = :roleId', { roleId: role.id })
.andWhere(new Brackets(qb => { qb .andWhere(new Brackets(qb => { qb
.where('assign.expiresAt IS NOT NULL') .where('assign.expiresAt IS NULL')
.orWhere('assign.expiresAt > :now', { now: new Date() }); .orWhere('assign.expiresAt > :now', { now: new Date() });
})) }))
.innerJoinAndSelect('assign.user', 'user'); .innerJoinAndSelect('assign.user', 'user');