From 6e394764f49a26a198293bcefa396ac25a649fa3 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 27 Apr 2022 13:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
index da32693cc7..467dea37e5 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
@@ -272,6 +272,7 @@
         WHERE
             ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId}
             AND LENGTH(ifi.COLUMN_NAME)>0
+        ORDER BY ifi.SORT
     </select>
 
 </mapper>
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 2c43dd6fee..873568d2b1 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
@@ -218,6 +218,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
         searchForm.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(searchForm, IcResiUserPageFormDTO.AddUserInternalGroup.class);
         searchForm.setIsPage(false);
+        searchForm.setPageSize(NumConstant.TEN_THOUSAND);
     }
 
     @Nullable