TIMOR-TELECOM/service-user-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing order by di user list

Browse Source
This commit is contained in:
fro1991
2025-05-30 20:12:07 +07:00
parent ca809a8642
commit 9f6e0df135
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/controllers/user.ts
View File

@ -84,20 +84,39 @@ export class UserController {
.where(whereAttr, whereVal); .where(whereAttr, whereVal);
const subquery = userRepository const subquery = userRepository
.createQueryBuilder() .createQueryBuilder("User")
.select("User.id") .select("User.id", "id")
.where(whereAttr, whereVal) .where(whereAttr, whereVal)
.orderBy(param.order_field, param.order_direction) .orderBy("User." + param.order_field, param.order_direction)
.offset(offset) .offset(offset)
.limit(param.limit); .limit(param.limit);
console.log('subquery :', subquery.getQuery());
const res_list = userRepository const res_list = userRepository
.createQueryBuilder() .createQueryBuilder("User")
.where(`User.id IN (${subquery.getQuery()})`) .innerJoin(
"(" + subquery.getQuery() + ")",
"sub",
"User.id = sub.id"
)
.setParameters(subquery.getParameters()) .setParameters(subquery.getParameters())
.leftJoinAndSelect("User.roles", "roles") .leftJoinAndSelect("User.roles", "roles")
.leftJoinAndSelect("roles.application", "application"); .leftJoinAndSelect("roles.application", "application")
.orderBy("User." + param.order_field, param.order_direction);
// const subquery = userRepository
// .createQueryBuilder()
// .select("User.id")
// .where(whereAttr, whereVal)
// .orderBy("User." + param.order_field, param.order_direction)
// .offset(offset)
// .limit(param.limit);
// const res_list = userRepository
// .createQueryBuilder()
// .where(`User.id IN (${subquery.getQuery()})`)
// .setParameters(subquery.getParameters())
// .leftJoinAndSelect("User.roles", "roles")
// .leftJoinAndSelect("roles.application", "application");
// const res_list = userRepository.createQueryBuilder() // const res_list = userRepository.createQueryBuilder()
// .where(whereAttr, whereVal) // .where(whereAttr, whereVal)
@ -107,6 +126,8 @@ export class UserController {
// .offset(offset) // .offset(offset)
// .limit(param.limit); // .limit(param.limit);
if (param.with_deleted) { if (param.with_deleted) {
res_count.withDeleted(); res_count.withDeleted();
res_list.withDeleted(); res_list.withDeleted();