From 83f18e10afcf40a9e7115d4367c308297ccbf832 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 18:27:31 +0800
Subject: [PATCH] 优化代码

---
 java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
old mode 100644
new mode 100755
index 0f62d75..52e2ef7
--- a/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Java110Converter.java
@@ -78,7 +78,7 @@
             return newDate;
         }
 
-        if (value instanceof BigDecimal) {
+        if (value instanceof BigDecimal && target == String.class) {
             BigDecimal bd = (BigDecimal) value;
             return bd.toPlainString();
         }
@@ -87,14 +87,23 @@
         }
 
         if (target == int.class || target == Integer.class) {
+            if(StringUtil.isNullOrNone(value)){
+                return 0;
+            }
             return Integer.parseInt(String.valueOf(value));
         }
 
         if (target == long.class || target == Long.class) {
+            if(StringUtil.isNullOrNone(value)){
+                return 0;
+            }
             return Long.parseLong(String.valueOf(value));
         }
 
         if (target == double.class || target == Double.class) {
+            if(StringUtil.isNullOrNone(value)){
+                return 0;
+            }
             return Double.parseDouble(String.valueOf(value));
         }
 
@@ -102,6 +111,15 @@
             return String.valueOf(value).split(",");
         }
 
+        //1.0 String 杞� Date
+        if (value instanceof String && target == boolean.class) {
+            String bl = (String) value;
+            if ("true".equals(bl)) {
+                return true;
+            }
+            return false;
+        }
+
         return value;
     }
 }

--
Gitblit v1.8.0