From d8ea4e728d8421a5ed0bad3486626d2b43b1333d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:00 +0800
Subject: [PATCH] 跨域设置
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 6 +++---
1 files changed, 3 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..2094ad5 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
--
Gitblit v1.8.0