From a9e09a83da29ddb2fc671452640245b50e58fff3 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 12 Jul 2023 15:01:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3list=E8=BD=ACmap=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserImportServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 80d337f65d..e3508891e8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -1492,7 +1492,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             return null;
         }
         try {
-            return options.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue));
+            return options.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue,(entity1,entity2)->entity1));
         } catch (Exception e) {
             String erroMsg = ExceptionUtils.getErrorStackTrace(e);
             log.error("【居民信息导入】{}转化Options为map失败，url:{}, cascadeItemId:{}, currUserAgencyId:{},错误信息:{}",