From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 5ae279f..3274397 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -44,6 +44,7 @@
     }
     @Override
     public List<MonitorPoint> queryWithStateByMap(Map<String, Object> params){
+        params.put("isDelete",Constants.IS_DELETE_FALSE);
         List<MonitorPoint> monitorPointList = monitorPointMapper.selectByMap(params);
         for(MonitorPoint monitorPoint:monitorPointList){
             Integer state = getStateFromRedis(monitorPoint.getId());

--
Gitblit v1.8.0