From 086c5602076c3a1327df5fdeed142e66912e8391 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 27 Feb 2018 22:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=9D=E5=A7=8B=E5=8C=96Em?=
 =?UTF-8?q?pUser=E8=A1=A8=E7=9A=84=E6=97=B6=E5=80=99=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=B2=A1=E6=9C=89=E6=88=90=E5=8A=9F=E6=8F=92?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/modules/sys/db/InitCoreData.java  | 61 ++++++++++---------
 .../java/com/jeesite/test/InitCoreData.java   |  2 +-
 2 files changed, 34 insertions(+), 29 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 b9608660..f17a29c4 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
@@ -70,6 +70,33 @@ public class InitCoreData extends BaseInitDataTests {
 		clearTable(Log.class);
 	}
 	
+	@Autowired
+	private AreaService areaService;
+	/**
+	 * 区域、行政区划表
+	 */
+	public void initArea() throws Exception{
+		try{
+			clearTable(Area.class);
+			initExcelData(Area.class, new MethodCallback() {
+				@Override
+				public Object execute(Object... params) {
+					String action = (String)params[0];
+					if("save".equals(action)){
+						Area entity = (Area)params[1];
+						entity.setIsNewRecord(true);
+						areaService.save(entity);
+						return null;
+					}
+					return null;
+				}
+			});
+		}catch(Exception e){
+			e.printStackTrace();
+			throw new Exception(e);
+		}
+	}
+	
 	@Autowired
 	private ConfigService configService;
 	/**
@@ -263,33 +290,6 @@ public class InitCoreData extends BaseInitDataTests {
 		}
 	}
 	
-	@Autowired
-	private AreaService areaService;
-	/**
-	 * 区域、行政区划表
-	 */
-	public void initArea() throws Exception{
-		try{
-			clearTable(Area.class);
-			initExcelData(Area.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Area entity = (Area)params[1];
-						entity.setIsNewRecord(true);
-						areaService.save(entity);
-						return null;
-					}
-					return null;
-				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
-	}
-	
 	@Autowired
 	private OfficeService officeService;
 	/**
@@ -389,7 +389,10 @@ public class InitCoreData extends BaseInitDataTests {
 						EmpUser entity = (EmpUser)params[1];
 						String header = (String)params[2];
 						String val = (String)params[3];
-						if ("employee.employeePosts".equals(header)){
+						if ("userRoleString".equals(header)){
+							entity.setUserRoleString(val);
+							return true;
+						}else if ("employee.employeePosts".equals(header)){
 							entity.getEmployee().setEmployeePosts(new String[]{val});
 							return true;
 						}
@@ -399,6 +402,8 @@ public class InitCoreData extends BaseInitDataTests {
 						entity.setIsNewRecord(true);
 						entity.setPassword(UserService.encryptPassword(entity.getPassword()));
 						empUserService.save(entity);
+						// 设置当前为管理员，否则无法保存用户角色关系
+						entity.setCurrentUser(new User(User.SUPER_ADMIN_CODE));
 						userService.saveAuth(entity);
 						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 14ad9c6f..8102e3fd 100644
--- a/web/src/test/java/com/jeesite/test/InitCoreData.java
+++ b/web/src/test/java/com/jeesite/test/InitCoreData.java
@@ -24,13 +24,13 @@ public class InitCoreData extends com.jeesite.modules.sys.db.InitCoreData {
 	public void initCoreData() throws Exception{
 		createTable();
 		initLog();
+		initArea();
 		initConfig();
 		initModule();
 		initDict();
 		initRole();
 		initMenu();
 		initUser();
-		initArea();
 		initOffice();
 		initCompany();
 		initPost();