|
|
@@ -236,7 +236,7 @@ export class UsersService {
|
|
|
public async getCount(apiUserId: number, roles?: Role, date?: string) {
|
|
|
return await this.userRepository.count({
|
|
|
where: {
|
|
|
- apiUserId: apiUserId,
|
|
|
+ orgId: apiUserId,
|
|
|
roles: roles,
|
|
|
createdAt: date
|
|
|
? And(MoreThanOrEqual(startOfDay(new Date(date))), LessThanOrEqual(endOfDay(new Date(date))))
|
|
|
@@ -263,7 +263,7 @@ export class UsersService {
|
|
|
|
|
|
public async getUsers(apiUserId: number, roles?: Role) {
|
|
|
let users = await this.userRepository.findBy({
|
|
|
- apiUserId: apiUserId,
|
|
|
+ orgId: apiUserId,
|
|
|
roles: roles
|
|
|
})
|
|
|
|