From 8ed7d6cd19f221c40e9994c0469009ff9c0e46b1 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Fri, 27 May 2022 17:27:10 -0700
Subject: Fix several manager issues

---
 src/main/java/org/traccar/storage/DatabaseStorage.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/traccar/storage')

diff --git a/src/main/java/org/traccar/storage/DatabaseStorage.java b/src/main/java/org/traccar/storage/DatabaseStorage.java
index e8966be8e..cd82448e1 100644
--- a/src/main/java/org/traccar/storage/DatabaseStorage.java
+++ b/src/main/java/org/traccar/storage/DatabaseStorage.java
@@ -128,9 +128,13 @@ public class DatabaseStorage extends Storage {
             conditions.add(new Condition.Equals(
                     Permission.getKey(propertyClass), Permission.getKey(propertyClass), propertyId));
         }
-        query.append(formatCondition(Condition.merge(conditions)));
+        Condition combinedCondition = Condition.merge(conditions);
+        query.append(formatCondition(combinedCondition));
         try {
             QueryBuilder builder = QueryBuilder.create(dataSource, query.toString());
+            for (Map.Entry<String, Object> variable : getConditionVariables(combinedCondition).entrySet()) {
+                builder.setValue(variable.getKey(), variable.getValue());
+            }
             return builder.executePermissionsQuery();
         } catch (SQLException e) {
             throw new StorageException(e);
-- 
cgit v1.2.3