From f8273502e7f4bfa6a8a0d8a027f4029d8e901421 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 12 Nov 2019 23:29:15 +0800
Subject: [PATCH] =?UTF-8?q?NumberUtils.formatNumber=20=E5=81=A5=E5=A3=AE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=87=8F=E5=B0=91=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jeesite/common/lang/NumberUtils.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/src/main/java/com/jeesite/common/lang/NumberUtils.java b/common/src/main/java/com/jeesite/common/lang/NumberUtils.java
index 7cc0a123..9991c51f 100644
--- a/common/src/main/java/com/jeesite/common/lang/NumberUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/NumberUtils.java
@@ -99,6 +99,16 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils {
 	 * @param pattern
 	 */
 	public static String formatNumber(Object data, String pattern) {
+		if (data == null){
+			return StringUtils.EMPTY;
+		}
+		if (data instanceof String){
+			if (StringUtils.isBlank((String)data)){
+				return StringUtils.EMPTY;
+			}else{
+				data = ObjectUtils.toDouble(data);
+			}
+		}
 		DecimalFormat df = null;
 		if (pattern == null) {
 			df = new DecimalFormat();