From 0d4ece959a7817cc8164edbc1764f5d56a5c5c91 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 23 Nov 2021 14:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0items=E4=B8=ADcolumnName=E5=92=8CcolumnNum=E7=9A=84?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5=EF=BC=8C=E5=85=B1=E5=90=8C=E7=BB=84=E6=88=90?=
 =?UTF-8?q?columnName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserImportServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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());