From 455498f1454449bfd127a560eeb01ffff823a6ca Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 13:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/common/util/ExampleUtil.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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);
--
Gitblit v1.8.0