From 8ad473d0e87886501a73cc408ebe7efbff25f373 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:16:01 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |    2 ++
 1 files changed, 2 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 5623fd7..982bbe0 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -29,6 +29,7 @@
 
 	@Override
 	public Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters) {
+		ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
 		Map<String, Object> result = new HashMap<String, Object>();
 		accountService.setOrgIdsByAccount(parameters);
 		List<Map<String, Object>> list = deviceMapper.getDeviceStatesByAccount(parameters);
@@ -81,6 +82,7 @@
 
 	@Override
 	public List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize) {
+		ValidateUtil.notNull(uid, "param.is.null");
 		Device device = new Device();
 		device.setOperateUserId(uid);
 		PageHelper.startPage(pageIndex, pageSize);

--
Gitblit v1.8.0