Merge pull request #2442 from FOCONIS/findmap-with-beancache-without-mapkey

findMap() with beanCache should use idPoperty if mapKey = null
This commit is contained in:
Rob Bygrave authored and GitHub committed 2021-11-22 15:15:07 +13:00
commit 34135360ed
2 files changed
+38 -1

No files matched your search

@@ -570,7 +570,12 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
}
private ElPropertyValue mapProperty() {
ElPropertyValue property = beanDescriptor.elGetValue(query.getMapKey());
ElPropertyValue property;
if (query.getMapKey() == null) {
property = beanDescriptor.idProperty();
} else {
property = beanDescriptor.elGetValue(query.getMapKey());
}
if (property == null) {
throw new IllegalStateException("Unknown map key property " + query.getMapKey());
}