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();