Commit faee8e6bf03b092b61f961dea3e568d0c234eee7

Authored by Igor Kulikov
1 parent b707ea09

Fix entity field alias resolution

@@ -406,7 +406,7 @@ public class EntityKeyMapping { @@ -406,7 +406,7 @@ public class EntityKeyMapping {
406 String entityFieldAlias = getEntityFieldAlias(filterType, entityType); 406 String entityFieldAlias = getEntityFieldAlias(filterType, entityType);
407 String column = null; 407 String column = null;
408 if (existingEntityFields.contains(entityFieldAlias)) { 408 if (existingEntityFields.contains(entityFieldAlias)) {
409 - column = entityFieldColumnMap.get(key.getKey()); 409 + column = entityFieldColumnMap.get(entityFieldAlias);
410 } 410 }
411 if (column != null) { 411 if (column != null) {
412 String field = alias + "." + column; 412 String field = alias + "." + column;
@@ -8997,10 +8997,10 @@ @@ -8997,10 +8997,10 @@
8997 "integrity": "sha512-4O3GWAYJaauMCILm07weko2rHA8a4kjn7+8Lg4s1d7SxwS/3IpkVD/GljbRrIJ1c1W/XGJ3GbuK7RyYZEJChhw==" 8997 "integrity": "sha512-4O3GWAYJaauMCILm07weko2rHA8a4kjn7+8Lg4s1d7SxwS/3IpkVD/GljbRrIJ1c1W/XGJ3GbuK7RyYZEJChhw=="
8998 }, 8998 },
8999 "ngx-flowchart": { 8999 "ngx-flowchart": {
9000 - "version": "git://github.com/thingsboard/ngx-flowchart.git#a4157b0eef2eb3646ef920447c7b06b39d54f87f", 9000 + "version": "git://github.com/thingsboard/ngx-flowchart.git#7a02f4748b5e7821a883c903107af5f20415d026",
9001 "from": "git://github.com/thingsboard/ngx-flowchart.git#master", 9001 "from": "git://github.com/thingsboard/ngx-flowchart.git#master",
9002 "requires": { 9002 "requires": {
9003 - "tslib": "^1.10.0" 9003 + "tslib": "^1.13.0"
9004 }, 9004 },
9005 "dependencies": { 9005 "dependencies": {
9006 "tslib": { 9006 "tslib": {