From 1746615933e419f631f56191fe2b85a744912e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Sun, 15 Jun 2025 11:21:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=A7=E5=93=81=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ProductModelFileMapper.xml        | 2 +-
 .../src/main/resources/mapper/ProductModelMapper.xml            | 2 +-
 .../src/main/resources/mapper/ProductSeriesMapper.xml           | 1 +
 .../src/main/resources/mapper/ProductTypeMapper.xml             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml
index d0a8ad7f..78ecf0af 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml
@@ -24,6 +24,6 @@
         SELECT pmfi.name,pmf.*
         FROM product_model_file pmf
                  INNER JOIN product_model_file_item pmfi ON pmf.id = pmfi.model_file_id
-        WHERE pmf.`enable` = 1 AND pmf.state = 1 AND pmfi.show_in_list = 1 AND pmf.model_id = #{modelId} AND pmfi.language_code = #{language}
+        WHERE pmf.`enable` = 1 AND pmf.state = 1 AND pmf.model_id = #{modelId} AND pmfi.language_code = #{language}
     </select>
 </mapper>
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
index 0c458889..e89d4cee 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
@@ -32,7 +32,7 @@
                 AND pm.no LIKE CONCAT('%', #{request.no}, '%')
             </if>
         </where>
-        ORDER BY pm.state,pm.id DESC
+        ORDER BY pm.state,pm.sort,pm.publish_time DESC
     </select>
 
     <select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelVO">
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
index 9e749bcb..7dab6d7e 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
@@ -23,6 +23,7 @@
                 AND ps.`name` LIKE CONCAT('%', #{request.name}, '%')
             </if>
         </where>
+        ORDER BY ps.state,ps.sort,ps.publish_time DESC
     </select>
 
     <select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductSeriesVO">
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
index 2dcf1b40..5f12d179 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
@@ -29,7 +29,7 @@
                 AND pt.name LIKE CONCAT('%', #{request.name}, '%')
             </if>
         </where>
-        ORDER BY pt.state,pt.series_name,pt.name,pt.publish_time DESC
+        ORDER BY pt.state,pt.sort,pt.series_name,pt.name,pt.publish_time DESC
     </select>
 
     <select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductTypeVO">