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 listBranchOptions() { + public List listBranchOptions() { String msg = "查询支部列表失败"; List branchList = getResultDataOrThrowsException(partyMemberOpenFeignClient.branchlist(), ServiceConstant.RESI_PARTYMEMBER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg); //结果平铺展开 - Map resultMap = new HashMap<>(); - branchList.forEach(option-> option.getCurrenNodeAllChild(option,resultMap)); - return branchList; + ArrayList optionResultDTOS = new ArrayList<>(); + convertCascader2OptionResultList4Import(branchList, optionResultDTOS); + return optionResultDTOS; + } + + + /** + * 居民信息导入专用:递归将cascader控件结果集,转化为列表结果集 + * @param sourceData 从哪个对象中取数据 + * @param targetData 将数据存储到这个对象中 + * @return + */ + private void convertCascader2OptionResultList4Import(List sourceData,List 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