if empty string, then remove from filter
This commit is contained in:
parent
c0b41eb040
commit
7bab40e4fa
@ -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(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user