From 8e4200323ac9242d8480de3818b087a00a85f7bb Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Sat, 20 Sep 2025 15:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/transferData/domain/UserFace.java     | 10 ++++++++++
 .../transferData/mapper/TransferDataMapper.java       |  6 +++---
 .../transferData/service/TransferDataService.java     | 11 +++++------
 3 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/domain/UserFace.java

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/domain/UserFace.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/domain/UserFace.java
new file mode 100644
index 00000000..e8f3c95a
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/domain/UserFace.java
@@ -0,0 +1,10 @@
+package org.dromara.transferData.domain;
+
+
+import lombok.Data;
+
+@Data
+public class UserFace {
+    private Long id;
+    private String pacePhoto;
+}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java
index 0660d761..fe39508d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java
@@ -77,13 +77,13 @@ public interface TransferDataMapper {
         "</script>")
     List<UserFile> getUserFileList(List<Long> goIds);
 
-
+    @DS("slave1")
     @Select("<script>" +
-        "SELECT id,pace_photo FROM sub_construction_user " +
+        "SELECT id,pace_photo FROM bus_construction_user " +
         "WHERE id IN " +
         "<foreach collection='goIds' item='userId' open='(' separator=',' close=')'>" +
         "#{userId}" +
         "</foreach>" +
         "</script>")
-    Map<Long, String> getUserFace(List<Long> goIds);
+    List<UserFace> getUserFace(List<Long> goIds);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java
index e03f913b..eae44dd8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java
@@ -26,10 +26,7 @@ import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.ISysOssService;
 import org.dromara.system.service.ISysUserService;
-import org.dromara.transferData.domain.ConstructionUserNew;
-import org.dromara.transferData.domain.OldFile;
-import org.dromara.transferData.domain.User;
-import org.dromara.transferData.domain.UserFile;
+import org.dromara.transferData.domain.*;
 import org.dromara.transferData.mapper.TransferDataMapper;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Async;
@@ -842,11 +839,13 @@ public class TransferDataService {
         }
 
         // 获取人脸照片路径映射
-        Map<Long, String> userFace = transferDataMapper.getUserFace(goIds);
+        List<UserFace> userFace = transferDataMapper.getUserFace(goIds);
+        Map<Long, String> facePicMap = userFace.stream()
+            .collect(Collectors.toMap(UserFace::getId, UserFace::getPacePhoto));
 
         List<SubConstructionUser> updateList = new ArrayList<>();
         for (SubConstructionUser user : usersWithoutFacePic) {
-            String facePic = userFace.get(user.getGoId());
+            String facePic = facePicMap.get(user.getGoId());
             if (facePic != null && !facePic.isEmpty()) {
                 Long facePicId = handleSinglePhotoLimit(facePic);
                 if (facePicId != null) {