From 8961624fd69ed51f84377cb1204e4a83618fd812 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 9 Nov 2018 20:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E5=88=92=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E5=8D=87=E5=AE=89=E8=A3=85=E9=80=9F=E5=BA=A6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jeesite/modules/sys/db/InitCoreData.java | 7 +++++--
 web/src/test/java/com/jeesite/test/InitCoreData.java       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
index 586a0fd3..ed09db25 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
@@ -86,7 +86,7 @@ public class InitCoreData extends BaseInitDataTests {
 	/**
 	 * 区域、行政区划表
 	 */
-	public void initArea() throws Exception{
+	public void initArea(String... prefixes) throws Exception{
 		clearTable(Area.class);
 		initExcelData(Area.class, new MethodCallback() {
 			@Override
@@ -95,7 +95,10 @@ public class InitCoreData extends BaseInitDataTests {
 				if("save".equals(action)){
 					Area entity = (Area)params[1];
 					entity.setIsNewRecord(true);
-					areaService.save(entity);
+					if (prefixes == null || prefixes.length == 0
+							|| StringUtils.startsWithAny(entity.getAreaCode(), prefixes)){
+						areaService.save(entity);
+					}
 					return null;
 				}
 				return null;
diff --git a/web/src/test/java/com/jeesite/test/InitCoreData.java b/web/src/test/java/com/jeesite/test/InitCoreData.java
index de19706c..609c8ba0 100644
--- a/web/src/test/java/com/jeesite/test/InitCoreData.java
+++ b/web/src/test/java/com/jeesite/test/InitCoreData.java
@@ -24,7 +24,7 @@ public class InitCoreData extends com.jeesite.modules.sys.db.InitCoreData {
 	public void initCoreData() throws Exception{
 		createTable();
 		initLog();
-		initArea();
+		initArea("3700","3701","3702");
 		initConfig();
 		initModule();
 		initDict();