diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
index 0385d700..56ca8cef 100644
Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
index 25cd14ca..76fd02ef 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
@@ -127,8 +127,11 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
 	public void save(EmpUser user) {
 		// 1、初始化用户信息
 		if (user.getIsNewRecord()){
-			userService.genId(user, user.getLoginCode());
-			user.setUserCode(user.getUserCode()+"_"+IdGen.randomBase62(4).toLowerCase());
+			// 如果没有设置用户编码，则根据登录名生成一个
+			if (StringUtils.isBlank(user.getUserCode())){
+				userService.genId(user, user.getLoginCode());
+				user.setUserCode(user.getUserCode()+"_"+IdGen.randomBase62(4).toLowerCase());
+			}
 			user.setUserType(EmpUser.USER_TYPE_EMPLOYEE);
 			user.setMgrType(EmpUser.MGR_TYPE_NOT_ADMIN);
 		}