From 501ebd43da6372ee753d422290327e339b04abb5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Mar 2018 10:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java |   10 ++++++++++
 1 files changed, 10 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 beed2e6..22c16d9 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -171,4 +171,14 @@
         }).collect(Collectors.toList());
         return list;
     }
+
+    @Override
+	public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId) {
+		MonitorPoint monitorPoint = new MonitorPoint();
+		monitorPoint.setIsDelete(Constants.IS_DELETE_FALSE);
+		if (Constants.isNotSpecialOrgId(orgId)) {
+			monitorPoint.setOrganizationId(orgId);
+		}
+		return monitorPointMapper.select(monitorPoint);
+	}
 }

--
Gitblit v1.8.0