From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 2094ad5..264ed65 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -474,4 +474,10 @@
 		return deviceMapper.getDevicesByProfession(parameters);
 	}
 
+	@Override
+	public List<Device> getDevicesByOrganizationId(Map<String, Object> parameters) {
+		ValidateUtil.notNull(parameters.get("organizationId"), "param.is.null");
+		return deviceMapper.getDevicesByOrganizationId(parameters);
+	}
+
 }

--
Gitblit v1.8.0