Browse Source

fixed query

pull/14640/head
dashevchenko 8 months ago
parent
commit
dc8d2d896a
  1. 1
      dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java

1
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java

@ -257,7 +257,6 @@ public class ModelConstants {
public static final String ALARM_ORIGINATOR_NAME_PROPERTY = "originator_name";
public static final String ALARM_ORIGINATOR_LABEL_PROPERTY = "originator_label";
public static final String ALARM_ORIGINATOR_TYPE_PROPERTY = "originator_type";
public static final String ALARM_ORIGINATOR_DISPLAY_NAME_PROPERTY = "originator_display_name";
public static final String ALARM_SEVERITY_PROPERTY = "severity";
public static final String ALARM_ASSIGNEE_ID_PROPERTY = "assignee_id";

2
dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java

@ -107,7 +107,7 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
" a.type as type, " +
" a.originator_name as originator_name, " +
" a.originator_label as originator_label, " +
" coalesce(a.originator_label, a.originator_label) as originator_display_name, " +
" coalesce(a.originator_label, a.originator_name) as originator_display_name, " +
" a.assignee_first_name as assignee_first_name, " +
" a.assignee_last_name as assignee_last_name, " +
" a.assignee_email as assignee_email, " +

Loading…
Cancel
Save