fix(user): Add check for deleted roles in ApplyFilters method
Deploy Application / deploy (push) Successful in 24s
Details
Deploy Application / deploy (push) Successful in 24s
Details
This commit is contained in:
parent
a324c539be
commit
c7a36f0bbd
|
|
@ -43,7 +43,8 @@ func (f *UserFilter) ApplyFilters(query *gorm.DB) *gorm.DB {
|
||||||
if f.GroupID != "" {
|
if f.GroupID != "" {
|
||||||
query = query.Joins("JOIN m_maintenance_group_role_users ON m_maintenance_group_role_users.user_id = m_users.id").
|
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").
|
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 != "" {
|
if f.RoleID != "" {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue