From f6e6ba5fd2493b228dbc8057a29b2b095f9b806b Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 3 Jul 2019 15:40:03 +0800
Subject: [PATCH] =?UTF-8?q?IdGen.nextCode=E7=BA=AF=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=97=B6long=E7=B2=BE=E5=BA=A6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jeesite/common/idgen/IdGenerate.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/idgen/IdGenerate.java b/common/src/main/java/com/jeesite/common/idgen/IdGenerate.java
index 6d26d846..31a974f8 100644
--- a/common/src/main/java/com/jeesite/common/idgen/IdGenerate.java
+++ b/common/src/main/java/com/jeesite/common/idgen/IdGenerate.java
@@ -7,7 +7,7 @@ import java.security.SecureRandom;
 import java.util.UUID;
 
 import com.jeesite.common.codec.EncodeUtils;
-import com.jeesite.common.lang.ObjectUtils;
+import com.jeesite.common.lang.NumberUtils;
 import com.jeesite.common.lang.StringUtils;
 
 /**
@@ -79,7 +79,7 @@ public class IdGenerate {
 			}
 			String prefix = str.substring(0, lastNotNumIndex + 1);
 			String numStr = str.substring(lastNotNumIndex + 1, str.length());
-			long num = ObjectUtils.toLong(numStr);
+			long num = NumberUtils.isCreatable(numStr) ? Long.valueOf(numStr) : 0;
 //			System.out.println("处理前："+str);
 			str = prefix + StringUtils.leftPad(String.valueOf(num + 1), numStr.length(), "0");
 //			System.out.println("处理后："+str);
@@ -102,6 +102,7 @@ public class IdGenerate {
 //		System.out.println(nextCode("EC02T099"));
 //		System.out.println(nextCode("EC02T100"));
 //		System.out.println(nextCode("EC02T10A"));
+//		System.out.println(nextCode("1123117153417957377"));
 ////		// 数值型ID重复验证测试
 ////		Set<String> set = SetUtils.newHashSet();
 ////		try{