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 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 dataDictList = welfareService.dao().query(Sys_data_dict.class, Cnd.NEW()); + Map> 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("""