提高可读性

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

@@ -174,7 +174,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                             String tableName = sqlColumn.getTableName();
                             String itemId = sqlColumn.getItemId();
                             String columnName = columnDTO.getColumnName();
-                            if (hiddenColumnSet.contains(columnName)){
+                            if (hiddenColumnSet.contains(columnName)) {
                                 return;
                             }
                             String vauleStr = value == null ? StrConstant.EPMETY_STR : value.toString();
@@ -268,9 +268,11 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
             String cacheValue = cache.getIfPresent(vauleStr);
             if (StringUtils.isNotBlank(cacheValue)) {
                 map.put(columnName, cacheValue);
-            } else {
-                String[] parts = icResiUserImportService.splitOptionSourceUrl(e.getOptionSourceValue());
+                return;
+            }
 
+            String[] parts = icResiUserImportService.splitOptionSourceUrl(e.getOptionSourceValue());
+            //如果是级联的 则调用级联获取接口 根据原始值逗号隔开的 赋值
             if (FormItemTypeEnum.CASCADER.getCode().equals(e.getItemType())) {
                 Map<String, OptionResultDTO> remoteOptionMap = icResiUserImportService.listRemoteCascadeOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query");
                 List<String> listOptions = new ArrayList<>();
@@ -285,12 +287,15 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                 String join = Joiner.on("-").join(listOptions);
                 cache.put(vauleStr, join);
                 map.put(columnName, join);
-                } else {
+                return;
+            }
             //todo 不支持多个itemId
             Map<String, String> remoteOptions = icResiUserImportService.listRemoteOptions(parts[0], parts[1], columnWrappers, currentStaffAgencyId, "query");
             if (FormItemTypeEnum.CHECKBOX.getCode().equals(e.getItemType())) {
                 remoteOptions.forEach((label, value) -> map.put(value, vauleStr.contains(value) ? StrConstant.YES : StrConstant.NO));
-                    } else if (FormItemTypeEnum.SELECT.getCode().equals(e.getItemType())) {
+                return;
+            }
+            if (FormItemTypeEnum.SELECT.getCode().equals(e.getItemType())) {
                 remoteOptions.forEach((label, value) -> {
                     if (vauleStr.equals(value)) {
                         map.put(columnName, label);
@@ -299,9 +304,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                     cache.put(value, label);
                 });
             }
-                }
-
-            }
         } catch (Exception ex) {
             log.warn("listRemoteOptions url", ex);
         }