From e3090643390143c8a5fe60bc526754d4c5eed643 Mon Sep 17 00:00:00 2001
From: zijiren233 <pyh1670605849@gmail.com>
Date: Fri, 19 Apr 2024 17:19:48 +0800
Subject: [PATCH] Fix: room member list room id error

---
 server/handlers/admin.go  | 2 +-
 server/handlers/member.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/handlers/admin.go b/server/handlers/admin.go
index a58d3af..8751295 100644
--- a/server/handlers/admin.go
+++ b/server/handlers/admin.go
@@ -284,7 +284,7 @@ func AdminGetRoomMembers(ctx *gin.Context) {
 	}
 	scopes = append(scopes, func(db *gorm.DB) *gorm.DB {
 		return db.
-			InnerJoins("JOIN room_members ON users.id = room_members.user_id").
+			InnerJoins("JOIN room_members ON users.id = room_members.user_id AND room_members.room_id = ?", room.ID).
 			Where("room_members.room_id = ?", room.ID)
 	}, db.PreloadRoomMembers())
 
diff --git a/server/handlers/member.go b/server/handlers/member.go
index c018e2c..a56b69a 100644
--- a/server/handlers/member.go
+++ b/server/handlers/member.go
@@ -81,7 +81,7 @@ func RoomMembers(ctx *gin.Context) {
 	}
 	scopes = append(scopes, func(db *gorm.DB) *gorm.DB {
 		return db.
-			InnerJoins("JOIN room_members ON users.id = room_members.user_id").
+			InnerJoins("JOIN room_members ON users.id = room_members.user_id AND room_members.room_id = ?", room.ID).
 			Where("room_members.room_id = ?", room.ID)
 	}, db.PreloadRoomMembers())
 
@@ -182,7 +182,7 @@ func RoomAdminMembers(ctx *gin.Context) {
 	}
 	scopes = append(scopes, func(db *gorm.DB) *gorm.DB {
 		return db.
-			InnerJoins("JOIN room_members ON users.id = room_members.user_id").
+			InnerJoins("JOIN room_members ON users.id = room_members.user_id AND room_members.room_id = ?", room.ID).
 			Where("room_members.room_id = ?", room.ID)
 	}, db.PreloadRoomMembers())