From 97d6d2f1fed10eb62aa965139f100a9963b4ef8e Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 9 Jul 2026 15:31:53 +0800
Subject: [PATCH] =?UTF-8?q?chore(build):=20=E5=AF=BC=E5=85=A5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B7=BB=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=92=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start/src/main/resources/bootstrap.yml            |  8 ++++----
 .../zcloud/basic/info/command/UserImportExe.java  | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml
index f467a2cb..ea7eb2ef 100644
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@@ -3,8 +3,8 @@ spring:
     import:
 #      - classpath:nacos.yml
 #      - classpath:sdk.yml
-      - classpath:nacos-prod.yml
-      - classpath:sdk-prod.yml
-#      - classpath:nacos-prod2.yml
-#      - classpath:sdk-prod2.yml
+#      - classpath:nacos-prod.yml
+#      - classpath:sdk-prod.yml
+      - classpath:nacos-prod2.yml
+      - classpath:sdk-prod2.yml
       - classpath:swagger.yml
diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java
index 6500dd23..d5274dcf 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java
@@ -415,7 +415,10 @@ public class UserImportExe {
         user.setPostId(postId);
         user.setCorpinfoId(corpinfoId);
         user.setName(importEntity.getName());
-
+        user.setUserIdCard(encodeBase64IdCard(importEntity.getUserIdCard()));
+        user.setPersonnelType(importEntity.getPersonnelType());
+        user.setPersonnelTypeName(importEntity.getPersonnelTypeName());
+        user.resetPassword(corpInfoDO.getType());
         userGateway.add(user);
         String corpName = null;
         if(corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())){
@@ -431,5 +434,15 @@ public class UserImportExe {
         allUsers.add(userDO);
         userDOTempList.add(userDO);
     }
+    private static String encodeBase64IdCard(String userIdCard) {
+        if (StringUtils.isEmpty(userIdCard)) {
+            return null;
+        }
+        try {
+            return Base64.getEncoder().encodeToString(userIdCard.trim().getBytes("UTF-8"));
+        } catch (Exception ex) {
+            return userIdCard.trim();
+        }
+    }
 }