From d07553f8cfdc4ce407122f905b49191b8ffbc7fb Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Dec 2017 10:19:18 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/common/util/ExampleUtil.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/common/util/ExampleUtil.java b/src/main/java/com/moral/common/util/ExampleUtil.java
index d50d02a..3fe825c 100644
--- a/src/main/java/com/moral/common/util/ExampleUtil.java
+++ b/src/main/java/com/moral/common/util/ExampleUtil.java
@@ -22,6 +22,7 @@
     public static Example generateExample(Class clzz, String params) {
         Example example = new Example(clzz);
         try {
+            if(StringUtils.isNullOrEmpty(params)){ return example;}
             params = URLDecoder.decode(params, "UTF-8");
             if (!StringUtils.isNullOrEmpty(params) && params.startsWith("or|")) {
                 String[] criteria = params.trim().split(OR_SPLIT);
@@ -41,10 +42,8 @@
                                     if (method != null && isPropertyOfClass(clzz, propertyName)) {
                                         List values = new ArrayList<Object>();
                                         if (conditionItems.length > 2) {
-                                            //���������������
-                                            Class<?> valutType = new PropertyDescriptor(propertyName, clzz).getPropertyType();
                                             for (int index = 2; index < conditionItems.length; index++) {
-                                                values.add(StringUtils.stringToObject4Type(valutType, conditionItems[index]));
+                                                values.add(conditionItems[index]);
                                             }
                                         }
                                         invokeMethod(criteriaOfExample,method,propertyName,values);

--
Gitblit v1.8.0