From ff93ecd1f2cb4c5ae8459430dd3e09fedad0e3ea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:04 +0800
Subject: [PATCH] device 增加 过滤 为删除条件 修复
---
src/main/java/com/moral/common/util/ExampleUtil.java | 11 ++++++++++-
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/common/util/ExampleUtil.java b/src/main/java/com/moral/common/util/ExampleUtil.java
index 65f8509..c74510b 100644
--- a/src/main/java/com/moral/common/util/ExampleUtil.java
+++ b/src/main/java/com/moral/common/util/ExampleUtil.java
@@ -139,7 +139,16 @@
List<Example.Criteria> criteriaList = example.getOredCriteria();
if(criteriaList!=null&&criteriaList.size()>0){
for(Example.Criteria cri : criteriaList){
- cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
+ boolean isHasIsDelete = false;
+ for(Example.Criterion con : cri.getCriteria()){
+ if( con.getCondition().indexOf("is_delete") >-1) {
+ isHasIsDelete = true;
+ break;
+ }
+ }
+ if( !isHasIsDelete) {
+ cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
+ }
}
}else {
example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 291d6c6..2094ad5 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -346,7 +346,7 @@
@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());
}
--
Gitblit v1.8.0