From e941b025dc79bb7783fc84ac87a1daf27c7f55b1 Mon Sep 17 00:00:00 2001 From: sindhu Date: Sat, 18 May 2024 21:31:54 +0700 Subject: [PATCH] service filter with dropdown --- services/dev/mastermenuuser.services.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/services/dev/mastermenuuser.services.go b/services/dev/mastermenuuser.services.go index e949b4e..3f96565 100644 --- a/services/dev/mastermenuuser.services.go +++ b/services/dev/mastermenuuser.services.go @@ -667,7 +667,11 @@ func (su *ServicesMasterMenuUser) GetListMasterUserFilteredBySearch(search strin // check jika parameter search nya tidak kosong if search != "" || (searchDropdown != "0" && searchDropdown != "") { - query += fmt.Sprintf(" AND (M_UserFullName LIKE '%%%s%%' OR M_UserEmail LIKE '%%%s%%') AND M_UserGroupID = '%s'", search, search, searchDropdown) + query += fmt.Sprintf(" AND (M_UserFullName LIKE '%%%s%%' OR M_UserEmail LIKE '%%%s%%')", search, search) + } + + if searchDropdown != "0" && searchDropdown != "" { + query += fmt.Sprintf(" AND M_UserGroupID = '%s' ", searchDropdown) } else { search = "%%" } @@ -725,8 +729,11 @@ func (su *ServicesMasterMenuUser) GetListMasterUserPagination(search string, sea offset := (currentPage - 1) * rowPerPage // offset := currentPage - if search != "" || (searchDropdown != "0" && searchDropdown != "") { - query += fmt.Sprintf(" AND (M_UserEmail LIKE '%%%s%%' OR M_UserFullName LIKE '%%%s%%') AND M_UserGroupID = '%s'", search, search, searchDropdown) + if search != "" { + query += fmt.Sprintf(" AND (M_UserEmail LIKE '%%%s%%' OR M_UserFullName LIKE '%%%s%%')", search, search) + } + if searchDropdown != "0" && searchDropdown != "" { + query += fmt.Sprintf(" AND M_UserGroupID = '%s' ", searchDropdown) } else { search = "%%" }