From c004fde3904c6d86146c7dbe5a4d797e68f17db9 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Wed, 17 Aug 2022 13:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91,=E5=B1=85=E6=B0=91ID=E5=88=97=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=8E=9F=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserExportServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/IcResiUserDao.xml                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
index c09b50b644..8157ac1ccf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java
@@ -245,10 +245,10 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
             } else if (Constant.OPITON_SOURCE_LOCAL.equals(sqlColumn.getOptionSourceType())) {
                 newValue = putOptionValue(formItemResult, vauleStr);
             }
+            o.put(key,newValue);
             if (FieldConstant.ID.equals(key)) {
                 newValue = Md5Util.md5(vauleStr);
             }
-            o.put(key,newValue);
             singleRowData.add(newValue);
         });
         resultData.add(singleRowData);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index c33a228661..8ba307f70c 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -249,7 +249,6 @@
 
     <select id="dynamicQuery" parameterType="map" resultType="java.util.LinkedHashMap">
         select
-            ic_resi_user.ID AS IC_RESI_ID,
             <choose>
             <when test="showSqlColumns != null and showSqlColumns.size() != 0">
                 <foreach collection="showSqlColumns" item="column" separator=",">