Merge pull request #1079 from SCADA-LTS/feature_s/#1008_Adding_a_10_l…

…ast_changes_history_feature_for_the_CMP_component Feature s/#1008 adding a 10 last changes history feature for the cmp component
SCADA-LTS · Dec 10, 2019 · 926a6dc · 926a6dc
2 parents 106b24d + 800db97
commit 926a6dc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/org/scada_lts/dao/MultiChangeHistoryDAOImp.java b/src/org/scada_lts/dao/MultiChangeHistoryDAOImp.java
@@ -49,19 +49,20 @@ public class MultiChangeHistoryDAOImp implements MultiChangesHistory {
                 "multi_changes_history mch, " +
                 "values_multi_changes_history vmch " +
             "where " +
-                "mch.id = vmch.multiChangesHistoryId " +
+                "(mch.id = vmch.multiChangesHistoryId) and " +
+                "(mch.viewAndComponentIdentification=?) " +
             "order by mch.ts desc;";
 
 	// @formatter:on
     @Override
     public List<MultiChangeHistoryValues> getHistory(String viewAndCmpId) {
         if (LOG.isTraceEnabled()) {
-            LOG.trace("SQL UserComents");
+            LOG.trace("SQL MultiChangeHistoryDAOImp viewAndCmpId:" + viewAndCmpId);
         }
 
         try {
 
-            List<MultiChangeHistoryValues> listUserComents = DAO.getInstance().getJdbcTemp().query(SQL, (ResultSet rs, int rownumber) -> {
+            List<MultiChangeHistoryValues> listUserComents = DAO.getInstance().getJdbcTemp().query(SQL, new String[]{viewAndCmpId.trim()}, (ResultSet rs, int rownumber) -> {
                     MultiChangeHistoryValues multiChangeHistoryValues = new MultiChangeHistoryValues();
                     multiChangeHistoryValues.setId(rs.getInt(COLUMN_NAME_MULTI_CHANGE_HISTORY_ID));
                     multiChangeHistoryValues.setUserId(rs.getInt(COLUMN_NAME_MULTI_CHANGE_HISTORY_USER_ID));