|
|
|
@ -593,7 +593,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { |
|
|
|
.append("nr.").append(fromOrTo).append("_type").append(" = re.").append(toOrFrom).append("_type"); |
|
|
|
|
|
|
|
notExistsPart.append(")"); |
|
|
|
whereFilter += " and ( re.lvl = " + entityFilter.getMaxLevel() + " OR " + notExistsPart.toString() + ")"; |
|
|
|
whereFilter += " and ( r_int.lvl = " + entityFilter.getMaxLevel() + " OR " + notExistsPart.toString() + ")"; |
|
|
|
} |
|
|
|
from = String.format(from, lvlFilter, whereFilter); |
|
|
|
String query = "( " + selectFields + from + ")"; |
|
|
|
@ -672,7 +672,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { |
|
|
|
.append(whereFilter.toString().replaceAll("re\\.", "nr\\.")); |
|
|
|
|
|
|
|
notExistsPart.append(")"); |
|
|
|
whereFilter.append(" and ( re.lvl = ").append(entityFilter.getMaxLevel()).append(" OR ").append(notExistsPart.toString()).append(")"); |
|
|
|
whereFilter.append(" and ( r_int.lvl = ").append(entityFilter.getMaxLevel()).append(" OR ").append(notExistsPart.toString()).append(")"); |
|
|
|
} |
|
|
|
from = String.format(from, lvlFilter, " WHERE " + whereFilter); |
|
|
|
return "( " + selectFields + from + ")"; |
|
|
|
|