From c7a36f0bbde134cc33b4762c69f8b8ce8f4fe5a1 Mon Sep 17 00:00:00 2001 From: Habib Fatkhul Rohman Date: Mon, 10 Nov 2025 13:33:48 +0700 Subject: [PATCH] fix(user): Add check for deleted roles in ApplyFilters method --- modules/user/query/user_query.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/user/query/user_query.go b/modules/user/query/user_query.go index 7e493d8..65f043e 100644 --- a/modules/user/query/user_query.go +++ b/modules/user/query/user_query.go @@ -43,7 +43,8 @@ func (f *UserFilter) ApplyFilters(query *gorm.DB) *gorm.DB { if f.GroupID != "" { query = query.Joins("JOIN m_maintenance_group_role_users ON m_maintenance_group_role_users.user_id = m_users.id"). Joins("JOIN m_maintenance_group_roles ON m_maintenance_group_roles.id = m_maintenance_group_role_users.maintenance_group_role_id"). - Where("m_maintenance_group_roles.maintenance_group_id = ?", f.GroupID) + Where("m_maintenance_group_roles.maintenance_group_id = ?", f.GroupID). + Where("m_maintenance_group_roles.deleted_at IS NULL") } if f.RoleID != "" {