Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@@ -76,7 +76,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
     /**
      * desc: 根据条件查询居民信息并根据配置模板导出
      *
-     *
      * @param tokenDto
      * @param exportResiUserFormDTO
      * @param response
@@ -209,6 +208,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
 
     /**
      * desc:校验查询表单参数
+     *
      * @param tokenDto
      * @param exportResiUserFormDTO
      */
@@ -247,6 +247,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
      * key:itemId,value: key:columnName,中文
      */
     private static Map<String, Cache<String, String>> remoteOptionCacheMap = new HashMap<>();
+
     private void putRemoteValue(Set<FormItemResult> conditionItemSet, String currentStaffAgencyId, Map<String, Object> map, Map<String, Object> originalConditionMap, FormItemResult e, String columnName, String vauleStr) {
         try {
             Map<String, IcResiUserImportServiceImpl.ColumnWrapper> columnWrappers = new HashMap<>();
@@ -269,12 +270,14 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                 String[] parts = icResiUserImportService.splitOptionSourceUrl(e.getOptionSourceValue());
 
                 if (FormItemTypeEnum.CASCADER.getCode().equals(e.getItemType())) {
-                    Map<String, OptionResultDTO> remoteOptions = icResiUserImportService.listRemoteCascadeOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query");
+                    Map<String, OptionResultDTO> remoteOptionMap = icResiUserImportService.listRemoteCascadeOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query");
                     List<String> listOptions = new ArrayList<>();
-                    remoteOptions.forEach((value,label) -> {
+                    String[] split = vauleStr.split(StrConstant.COMMA);
+                    Arrays.stream(split).forEach((value) -> {
                         //todo 看看怎么更好的利用本地缓存
-                        if (vauleStr.equals(value)) {
-                            listOptions.add(label.getLabel());
+                        OptionResultDTO optionResultDTO = remoteOptionMap.get(value);
+                        if (optionResultDTO != null) {
+                            listOptions.add(optionResultDTO.getLabel());
                         }
                     });
                     String join = Joiner.on("-").join(listOptions);
@@ -338,6 +341,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
 
     /**
      * desc:获取表单配置
+     *
      * @param customerId
      * @return map key:tableName ,value:ExportResiUserItemDTO
      */