Commit ba96409e5d2efd2bfa7b9750a2a24ae46854b113
Committed by
Andrew Shvayka
Andrew Shvayka
1 parent
ee6bc5ec
Code review fixes
Showing
1 changed file
with
0 additions
and
5 deletions
| @@ -479,9 +479,6 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -479,9 +479,6 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 479 | .append(" and ") | 479 | .append(" and ") |
| 480 | .append("nr.").append(fromOrTo).append("_type").append(" = re.").append(toOrFrom).append("_type"); | 480 | .append("nr.").append(fromOrTo).append("_type").append(" = re.").append(toOrFrom).append("_type"); |
| 481 | 481 | ||
| 482 | - if (!StringUtils.isEmpty(entityFilter.getRelationType())) { | ||
| 483 | - notExistsPart.append(" and nr.relation_type = :where_relation_type"); | ||
| 484 | - } | ||
| 485 | notExistsPart.append(")"); | 482 | notExistsPart.append(")"); |
| 486 | whereFilter += " and ( re.lvl = " + entityFilter.getMaxLevel() + " OR " + notExistsPart.toString() + ")"; | 483 | whereFilter += " and ( re.lvl = " + entityFilter.getMaxLevel() + " OR " + notExistsPart.toString() + ")"; |
| 487 | } | 484 | } |
| @@ -554,9 +551,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -554,9 +551,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 554 | 551 | ||
| 555 | StringBuilder notExistsPart = new StringBuilder(); | 552 | StringBuilder notExistsPart = new StringBuilder(); |
| 556 | notExistsPart.append(" NOT EXISTS (SELECT 1 from relation nr WHERE "); | 553 | notExistsPart.append(" NOT EXISTS (SELECT 1 from relation nr WHERE "); |
| 557 | - notExistsPart.append(whereFilter.toString()); | ||
| 558 | notExistsPart | 554 | notExistsPart |
| 559 | - .append(" and ") | ||
| 560 | .append("nr.").append(fromOrTo).append("_id").append(" = re.").append(toOrFrom).append("_id") | 555 | .append("nr.").append(fromOrTo).append("_id").append(" = re.").append(toOrFrom).append("_id") |
| 561 | .append(" and ") | 556 | .append(" and ") |
| 562 | .append("nr.").append(fromOrTo).append("_type").append(" = re.").append(toOrFrom).append("_type") | 557 | .append("nr.").append(fromOrTo).append("_type").append(" = re.").append(toOrFrom).append("_type") |