Fix permission requests

2 files changed, 2 insertions, 6 deletions

diff --git a/src/main/java/org/traccar/api/ExtendedObjectResource.java b/src/main/java/org/traccar/api/ExtendedObjectResource.java
index 40d679ded..1c306630c 100644
--- a/src/main/java/org/traccar/api/ExtendedObjectResource.java
+++ b/src/main/java/org/traccar/api/ExtendedObjectResource.java
@@ -56,11 +56,11 @@ public class ExtendedObjectResource<T extends BaseModel> extends BaseObjectResou
 
         if (groupId > 0) {
             permissionsService.checkPermission(Group.class, getUserId(), groupId);
-            conditions.add(new Condition.Permission(Group.class, groupId, baseClass));
+            conditions.add(new Condition.Permission(Group.class, groupId, baseClass).excludeGroups());
         }
         if (deviceId > 0) {
             permissionsService.checkPermission(Device.class, getUserId(), deviceId);
-            conditions.add(new Condition.Permission(Device.class, deviceId, baseClass));
+            conditions.add(new Condition.Permission(Device.class, deviceId, baseClass).excludeGroups());
         }
 
         return storage.getObjects(baseClass, new Request(new Columns.All(), Condition.merge(conditions)));
diff --git a/src/main/java/org/traccar/storage/query/Condition.java b/src/main/java/org/traccar/storage/query/Condition.java
index 91ede236c..4cfdc907f 100644
--- a/src/main/java/org/traccar/storage/query/Condition.java
+++ b/src/main/java/org/traccar/storage/query/Condition.java
@@ -165,10 +165,6 @@ public interface Condition {
             this(ownerClass, ownerId, propertyClass, 0, false);
         }
 
-        public Permission(Class<?> ownerClass, Class<?> propertyClass, long propertyId) {
-            this(ownerClass, 0, propertyClass, propertyId, false);
-        }
-
         public Permission excludeGroups() {
             return new Permission(this.ownerClass, this.ownerId, this.propertyClass, this.propertyId, true);
         }