diff --git a/.travis.yml b/.travis.yml index 1aa33ca09c..98f73d4f66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ branches: only: - "/^PROC-.*$/" - "/^develop-sdtabilit.*$/" + - "/^master-sdtabilit.*$/" notifications: email: false env: diff --git a/src/org/scada_lts/dao/UnsilencedAlarmDAO.java b/src/org/scada_lts/dao/UnsilencedAlarmDAO.java index 80fe5bb2f8..cb598d9d01 100644 --- a/src/org/scada_lts/dao/UnsilencedAlarmDAO.java +++ b/src/org/scada_lts/dao/UnsilencedAlarmDAO.java @@ -47,7 +47,7 @@ public class UnsilencedAlarmDAO { + "userEvents u " + "join events e on u.eventId=e.id " + "where " - + "u.silenced='false' " + + "u.silenced='N' " + "group by " + "userId"; // @formatter:on @@ -62,7 +62,7 @@ protected List getAll() { public UnsilencedAlarmLevelCache mapRow(ResultSet rs, int rownumber) throws SQLException { UnsilencedAlarmLevelCache unsilencedAlarmLevel = new UnsilencedAlarmLevelCache(); unsilencedAlarmLevel.setAlarmLevel(rs.getInt(COLUMN_NAME_MAX)); - unsilencedAlarmLevel.setAlarmLevel(rs.getInt(COLUMN_NAME_USERID)); + unsilencedAlarmLevel.setUserId(rs.getInt(COLUMN_NAME_USERID)); return unsilencedAlarmLevel; } });