From ad3d55667800ae238e843d04287d08cf15cfa0bc Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Tue, 28 Jun 2022 17:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=91=E4=BF=AE=E5=A4=8D:=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9cascader=E7=A9=BA=E9=97=B4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcResiUserImportServiceImpl.java     | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

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 cbf86a9b38..fc0b35888e 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
@@ -1405,14 +1405,34 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      * 支部列表选项
      * @return
      */
-    private List<OptionResultDTO> listBranchOptions() {
+    public List<OptionResultDTO> listBranchOptions() {
         String msg = "查询支部列表失败";
         List<OptionResultDTO> branchList = getResultDataOrThrowsException(partyMemberOpenFeignClient.branchlist(),
                 ServiceConstant.RESI_PARTYMEMBER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg);
         //结果平铺展开
-        Map<String, OptionResultDTO> resultMap = new HashMap<>();
-        branchList.forEach(option-> option.getCurrenNodeAllChild(option,resultMap));
-        return branchList;
+        ArrayList<OptionResultDTO> optionResultDTOS = new ArrayList<>();
+        convertCascader2OptionResultList4Import(branchList, optionResultDTOS);
+        return optionResultDTOS;
+    }
+
+
+    /**
+     * 居民信息导入专用：递归将cascader控件结果集，转化为列表结果集
+     * @param sourceData 从哪个对象中取数据
+     * @param targetData 将数据存储到这个对象中
+     * @return
+     */
+    private void convertCascader2OptionResultList4Import(List<OptionResultDTO> sourceData,List<OptionResultDTO> targetData) {
+        if (CollectionUtils.isEmpty(sourceData)) {
+            return;
+        }
+        for (OptionResultDTO item : sourceData) {
+            OptionResultDTO option = new OptionResultDTO();
+            option.setLabel(item.getLabel());
+            option.setValue(item.getValue());
+            targetData.add(option);
+            convertCascader2OptionResultList4Import(item.getChildren(), targetData);
+        }
     }
 
     @Override