singular type has priority over multiple types

common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java

@@ -38,7 +38,7 @@ public class AssetTypeFilter implements EntityFilter {
     private List<String> assetTypes;
 
     public List<String> getAssetTypes() {
-        if (CollectionUtils.isEmpty(assetTypes)) {
+        if (assetType != null) {
             assetTypes = Collections.singletonList(assetType);
         }
         return assetTypes;

common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java

@@ -42,7 +42,7 @@ public class DeviceTypeFilter implements EntityFilter {
     private List<String> deviceTypes;
 
     public List<String> getDeviceTypes() {
-        if (CollectionUtils.isEmpty(deviceTypes)) {
+        if (deviceType != null) {
             deviceTypes = Collections.singletonList(deviceType);
         }
         return deviceTypes;

common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java

@@ -38,7 +38,7 @@ public class EdgeTypeFilter implements EntityFilter {
     private List<String> edgeTypes;
 
     public List<String> getEdgeTypes() {
-        if (CollectionUtils.isEmpty(edgeTypes)) {
+        if (edgeType != null) {
             edgeTypes = Collections.singletonList(edgeType);
         }
         return edgeTypes;

common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java

@@ -38,7 +38,7 @@ public class EntityViewTypeFilter implements EntityFilter {
     private List<String> entityViewTypes;
 
     public List<String> getEntityViewTypes() {
-        if (CollectionUtils.isEmpty(entityViewTypes)) {
+        if (entityViewType != null) {
             entityViewTypes = Collections.singletonList(entityViewType);
         }
         return entityViewTypes;