Merge branch 'join' into lukman/1-agustus-2024

2024-08-01 10:09:37 +08:00
parent 86b0e93121 3156dd2961
commit d5c9c6081c
11 changed files with 208 additions and 36 deletions
--- a/src/module/user/api/get/getAllUser.ts
+++ b/src/module/user/api/get/getAllUser.ts
@@ -11,8 +11,10 @@ export async function getAllUser(req: NextRequest) {
    const users = await prisma.user.findMany({
      where: {
        isActive: active == "true" ? true : false,
-        idVillage: idVillage,
-        idGroup: idGroup,
+        idUserRole: String(idUserRole),
+        idPosition: String(idPosition),
+        idVillage: String(idVillage),
+        idGroup: String(idGroup),
      },
      select: {
        id: true,