From 79d14f23f7e33dedde9dfe0fb73b89bd8f505080 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 16 Aug 2018 16:55:49 +0800
Subject: [PATCH] 获取组织信息
---
src/main/java/com/moral/common/util/ExampleUtil.java | 13 +++++++++++--
1 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..af4467c 100644
--- a/src/main/java/com/moral/common/util/ExampleUtil.java
+++ b/src/main/java/com/moral/common/util/ExampleUtil.java
@@ -55,7 +55,7 @@
}
if(!StringUtils.isNullOrEmpty(params)){
params = URLDecoder.decode(params, "UTF-8");
- if (!StringUtils.isNullOrEmpty(params) && params.startsWith("or|")) {
+ if (params.startsWith("or|")) {
String[] criteria = params.trim().split(OR_SPLIT);
for (String criterion : criteria) {
// criterion���null���""������
@@ -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