From e6dbd0921e04a13c062afe6323add395a1afa08c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:30:23 +0800
Subject: [PATCH] 组织模块

---
 src/main/java/com/moral/common/util/ExampleUtil.java |    6 +++++-
 1 files changed, 5 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 3277d11..f395cba 100644
--- a/src/main/java/com/moral/common/util/ExampleUtil.java
+++ b/src/main/java/com/moral/common/util/ExampleUtil.java
@@ -47,7 +47,7 @@
             if (!StringUtils.isNullOrEmpty(params) && params.startsWith("or|")) {
                 String[] criteria = params.trim().split(OR_SPLIT);
                 for (String criterion : criteria) {
-                    Example.Criteria criteriaOfExample = example.or();
+                    Example.Criteria criteriaOfExample = null;
                     if (!StringUtils.isNullOrEmpty(criterion)) {
                         String[] conditions = criterion.trim().split(CRITERIA_SPLIT);
                         for (String condition : conditions) {
@@ -66,6 +66,10 @@
                                                 values.add(conditionItems[index]);
                                             }
                                         }
+                                        //��������������������������������� or ���������
+                                        if(criteriaOfExample == null){
+                                            criteriaOfExample = example.or();
+                                        }
                                         invokeMethod(criteriaOfExample,method,propertyName,values);
                                     }
 

--
Gitblit v1.8.0