From d6a0ac523af2db9216d30fabf1063c095c5b41e1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 06 Jul 2018 15:52:39 +0800
Subject: [PATCH] app接口

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

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 9d5f219..8aa95dc 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -346,12 +346,12 @@
 	@Override
 	public PageBean queryByPageBean(PageBean pageBean) {
 		Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
-		addDeletesToExample(example);
+//		addDeletesToExample(example);
 		if(pageBean.getPageSize()>0){
 			PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
 		}
-		List<Device> organizationList = deviceMapper.selectWithRelationData(example);
-		return new PageBean(organizationList);
+		List<Device> deviceList = deviceMapper.selectWithRelationData(example);
+		return new PageBean(deviceList);
 	}
 
 	@Override
@@ -474,4 +474,9 @@
 		return deviceMapper.getDevicesByProfession(parameters);
 	}
 
+	@Override
+	public List<Device> getDevicesByOrganizationId(Map<String, Object> parameters) {
+		return deviceMapper.getDevicesByOrganizationId(parameters);
+	}
+
 }

--
Gitblit v1.8.0