From e3622082c8afab93aecd537891fad7e8f90eadb1 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Tue, 9 Apr 2024 18:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/IssueProjectCategoryDictDao.xml   | 2 +-
 .../partymember/controller/YiFengScreenController.java      | 6 +++---
 .../partymember/service/impl/IcSeedCompanyServiceImpl.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
index 128eef8526..da64f0e545 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -170,7 +170,7 @@
     </update>
 
 
-    <select id="getMaxCategoryCode" resultType="Integer">
+    <select id="getMaxCategoryCode" resultType="int">
         SELECT
             IFNULL( MAX(CATEGORY_CODE), 0)
         FROM
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
index 0bb08eed00..5f6d31bbfc 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
@@ -189,10 +189,10 @@ public class YiFengScreenController {
      * @Date: 2024/3/21 16:02
      */
     @GetMapping("seedCompanyList")
-    public Result<PageData<IcSeedCompanyDTO>> seedCompanyList(){
+    public Result<List<IcSeedCompanyDTO>> seedCompanyList(){
         Map<String, Object> params = new HashMap<>();
-        PageData<IcSeedCompanyDTO> page = icSeedCompanyService.page(params);
-        return new Result<PageData<IcSeedCompanyDTO>>().ok(page);
+        List<IcSeedCompanyDTO> page = icSeedCompanyService.list(params);
+        return new Result<List<IcSeedCompanyDTO>>().ok(page);
     }
 
     /**
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedCompanyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedCompanyServiceImpl.java
index 48c5d285af..403700de45 100755
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedCompanyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedCompanyServiceImpl.java
@@ -67,7 +67,7 @@ public class IcSeedCompanyServiceImpl extends BaseServiceImpl<IcSeedCompanyDao,
 
         QueryWrapper<IcSeedCompanyEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
+        wrapper.orderByAsc("SORT");
         return wrapper;
     }