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 = "%%"
 	}