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 b2adb20543..f36d746475 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 @@ -670,13 +670,16 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res ColumnWrapper columnWrapper = new ColumnWrapper(); + String columnName = item.getColumnName(); + Integer columnNum = item.getColumnNum(); + // 填充options columnWrapper.setItemType(item.getItemType()); columnWrapper.setItemId(item.getItemId()); String groupLabel = item.getGroupLabel(); String combinedLabel = StringUtils.isBlank(groupLabel) ? item.getLabel() : groupLabel.concat(":").concat(item.getLabel()); columnWrapper.setCombinedLabel(combinedLabel); - columnWrapper.setColumnName(item.getColumnName()); + columnWrapper.setColumnName((columnNum == null || columnNum == 0) ? columnName : columnName + columnNum); columnWrapper.setColIndex(entry.getValue()); columnWrapper.setRequired(item.getRequired());