100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Bug fix for building SQL from AssetQuery
Rich Turner399e9ddc3652
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex b4a6aa6f5..d02eb6074 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -483,7 +483,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicreturn persistenceService.doReturningTransaction(entityManager -> {try {return entityManager.createQuery(- "select count(a) from Asset a where :parentAssetId = any(get_asset_tree_path(a.ID)) AND a.id IN :assetIds",+ "select count(a) from Asset a where :parentAssetId = a.PATH AND a.id IN :assetIds",Long.class).setParameter("parentAssetId", parentAssetId).setParameter("assetIds", assetIds)@@ -937,7 +937,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicbinders.add(st -> st.setString(pos, query.tenant.realm));}- if (query.userId != null) {+ if (query.ids == null && query.userId != null) {sb.append(" and ua.ASSET_ID = a.ID and ua.USER_ID = ?");final int pos = binders.size() + 1;binders.add(st -> st.setString(pos, query.userId));