From ec1d9f1aa17c544121e4ff14005f3edb1e4f72d2 Mon Sep 17 00:00:00 2001
From: zhangrui <zr15972328402@163.com>
Date: Wed, 10 Jun 2026 15:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E6=98=8C=E5=A4=A7=E5=AD=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=BF=83=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=9B=BD=E7=B1=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/impl/SysDataUserPullServiceImpl.java    | 12 ++++++++----
 src/test/java/com/budwk/app/WelfareTest.java         |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java
index 7b435aa3..efdb216c 100644
--- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java
+++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java
@@ -157,10 +157,14 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
                         if (mapping.field.getType() == String.class) {
 
                             if (StrUtil.isNotBlank(mapping.dict)) {
-                                Sys_data_dict sysDataDict = dataDictMap.get(mapping.dict).stream()
-                                        .filter(v -> raw.getStr(mapping.key)
-                                                .equals(v.getCode())).findFirst().orElse(new Sys_data_dict());
-                                mapping.field.set(sysUser, sysDataDict.getName());
+                                if (mapping.dict.equals("USER_NATIONALITY") && raw.getStr(mapping.key).equals("344")) {
+                                    mapping.field.set(sysUser, "中国（香港）");
+                                } else {
+                                    Sys_data_dict sysDataDict = dataDictMap.get(mapping.dict).stream()
+                                            .filter(v -> raw.getStr(mapping.key)
+                                                    .equals(v.getCode())).findFirst().orElse(new Sys_data_dict());
+                                    mapping.field.set(sysUser, sysDataDict.getName());
+                                }
                             } else {
                                 // 特殊处理 根据身份证号获取性别和出生年月
                                 if ("sfzjh".equals(mapping.field.getName())) {
diff --git a/src/test/java/com/budwk/app/WelfareTest.java b/src/test/java/com/budwk/app/WelfareTest.java
index eb9fd8fc..fc876057 100644
--- a/src/test/java/com/budwk/app/WelfareTest.java
+++ b/src/test/java/com/budwk/app/WelfareTest.java
@@ -68,6 +68,14 @@ public class WelfareTest {
     @Inject
     private WelfareProjectService welfareService;
 
+    @Test
+    public void test() {
+        List<Sys_data_dict> dataDictList = welfareService.dao().query(Sys_data_dict.class, Cnd.NEW());
+        Map<String, List<Sys_data_dict>> dataDictMap = dataDictList.stream().collect(Collectors.groupingBy(Sys_data_dict::getParentCode));
+        dataDictMap.get("USER_NATIONALITY").stream().forEach(System.out::println);
+        System.out.println("123");
+    }
+
     @Test
     public void importPhysicalExamination() {
         Sql sql = Sqls.create("""