From 0db6d8adadc770b56ababef11f56fe86d2c18a0f Mon Sep 17 00:00:00 2001
From: fro1991 <irawanferro@gmail.com>
Date: Fri, 24 Jan 2025 16:56:46 +0700
Subject: [PATCH] udpateg

---
 src/controllers/user.ts | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/controllers/user.ts b/src/controllers/user.ts
index 59a510a..5764bf9 100644
--- a/src/controllers/user.ts
+++ b/src/controllers/user.ts
@@ -83,14 +83,29 @@ export class UserController {
 
             const res_count = userRepository.createQueryBuilder()
                 .where(whereAttr, whereVal);
-            const res_list = userRepository.createQueryBuilder()
+
+            const subquery = userRepository
+                .createQueryBuilder()
+                .select("User.id")
                 .where(whereAttr, whereVal)
-                .leftJoinAndSelect("User.roles", "roles")
-                .leftJoinAndSelect("roles.application", "application")
                 .orderBy(param.order_field, param.order_direction)
                 .offset(offset)
                 .limit(param.limit);
 
+            const res_list = userRepository
+                .createQueryBuilder()
+                .where(`User.id IN (${subquery.getQuery()})`)
+                .leftJoinAndSelect("User.roles", "roles")
+                .leftJoinAndSelect("roles.application", "application");
+
+            // const res_list = userRepository.createQueryBuilder()
+            //     .where(whereAttr, whereVal)
+            //     .leftJoinAndSelect("User.roles", "roles")
+            //     .leftJoinAndSelect("roles.application", "application")
+            //     .orderBy(param.order_field, param.order_direction)
+            //     .offset(offset)
+            //     .limit(param.limit);
+
             if (param.with_deleted) {
                 res_count.withDeleted();
                 res_list.withDeleted();