简柏林 / thingskit · Commits

Commit 4dc6b45547b6488fb99e10824264a1df6a69a02f

Authored by YevhenBondarenko
Committed by Andrew Shvayka
1 parent e7c19013

DefaultAlarmQueryRepository improvements

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
... ... @@ -77,7 +77,7 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
77 77 alarmFieldColumnMap.put("originator", "originator_name");
78 78 }
79 79
80   - private static final String SELECT_ORIGINATOR_NAME = " CASE" +
  80 + private static final String SELECT_ORIGINATOR_NAME = " COALESCE(CASE" +
81 81 " WHEN a.originator_type = " + EntityType.TENANT.ordinal() +
82 82 " THEN (select title from tenant where id = a.originator_id)" +
83 83 " WHEN a.originator_type = " + EntityType.CUSTOMER.ordinal() +
... ... @@ -92,7 +92,7 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
92 92 " THEN (select name from device where id = a.originator_id)" +
93 93 " WHEN a.originator_type = " + EntityType.ENTITY_VIEW.ordinal() +
94 94 " THEN (select name from entity_view where id = a.originator_id)" +
95   - " END as originator_name";
  95 + " END, 'Deleted') as originator_name";
96 96
97 97 private static final String FIELDS_SELECTION = "select a.id as id," +
98 98 " a.created_time as created_time," +
... ...