From 7bab40e4fa1e02f190b1981bef6894177cbdefd6 Mon Sep 17 00:00:00 2001 From: gowthaman Date: Mon, 12 Aug 2024 12:04:37 +0530 Subject: [PATCH] if empty string, then remove from filter --- src/main/kotlin/com/restapi/controllers/Entities.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/restapi/controllers/Entities.kt b/src/main/kotlin/com/restapi/controllers/Entities.kt index aae87b4..a7bc87f 100644 --- a/src/main/kotlin/com/restapi/controllers/Entities.kt +++ b/src/main/kotlin/com/restapi/controllers/Entities.kt @@ -145,7 +145,17 @@ object Entities { val entity = ctx.pathParam("entity").lowercase() val noCreatedFilter = currentRoles().contains("ROLE_ADMIN") || sql.createdBy.isNullOrEmpty() val createdFilter = if (noCreatedFilter) "" else "and created_by = :cBy" - val searchJsonMap = sql.params.map { e -> Pair(e.key, e.value.getValue()) }.toMap() + val searchJsonMap = sql.params.map { e -> Pair(e.key, e.value.getValue()) } + .filter { + val second = it.second + if (second is String) { + second.isNotEmpty() + } else { + true + } + } + .toMap() + logger.warn("convert ${sql.params} to $searchJsonMap") val fl = database.find(DataModel::class.java) .setRawSql( RawSqlBuilder.parse(