From 247f3dfeef5a4117c6df9a4038def672160e5f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 8 Jul 2025 12:01:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=B2=E6=96=B9=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/mapper/ProductModelParamsMapper.java   |  2 ++
 .../service/IProductModelParamsService.java           |  2 ++
 .../service/impl/ProductModelParamsServiceImpl.java   |  5 +++++
 .../service/impl/ProductModelServiceImpl.java         |  4 ++--
 .../resources/mapper/ProductModelParamsMapper.xml     | 11 +++++++++++
 .../src/main/resources/mapper/ProductSeriesMapper.xml |  2 +-
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
index dccf9277..4071a1ce 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
@@ -24,4 +24,6 @@ public interface ProductModelParamsMapper extends BaseMapper<ProductModelParams>
     void copyItems(Integer oldId, Integer newId);
 
     List<ProductParamsItemVO> getMainListByLanguage(Integer modelId, String language);
+
+    List<ProductModelParamVO> getCompareListByLanguage(Integer modelId, String language);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java
index c1740a43..09ac0028 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java
@@ -52,4 +52,6 @@ public interface IProductModelParamsService extends IService<ProductModelParams>
     List<ProductModelMainParamsItemChildrenVO> getCNList(Integer modelId);
 
     List<ProductParamsItemVO> getMainListByLanguage(Integer modelId, String language);
+
+    List<ProductModelParamVO> getCompareListByLanguage(Integer modelId, String language);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
index d5be68ab..45a10a6b 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
@@ -240,4 +240,9 @@ public class ProductModelParamsServiceImpl extends ServiceImpl<ProductModelParam
     public List<ProductParamsItemVO> getMainListByLanguage(Integer modelId, String language) {
         return baseMapper.getMainListByLanguage(modelId,language);
     }
+
+    @Override
+    public List<ProductModelParamVO> getCompareListByLanguage(Integer modelId, String language) {
+        return baseMapper.getCompareListByLanguage(modelId,language);
+    }
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
index b759410e..57cc400c 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
@@ -1,7 +1,6 @@
 package com.nflg.mobilebroken.repository.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -199,6 +198,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
                 .eq(ProductModel::getTypeNumber, typeNumber)
                 .eq(ProductModel::getEnable, true)
                 .eq(ProductModel::getState, PublishState.Published.getState())
+                .orderByAsc(ProductModel::getSort)
                 .list();
         if (CollectionUtil.isNotEmpty(list)){
             return list.stream().map(item -> new ProductModelVO()
@@ -407,6 +407,6 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
                 .setId(productModel.getId())
                 .setNo(productModel.getNo())
                 .setImage(productModel.getImage())
-                .setParams(productPartParamsService.getAllListByLanguage(modelId, language));
+                .setParams(productPartParamsService.getCompareListByLanguage(modelId, language));
     }
 }
\ No newline at end of file
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
index 05b92c74..6ea49c43 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
@@ -41,4 +41,15 @@
           AND pmpi.language_code = #{language}
         ORDER BY pmp.id DESC
     </select>
+
+    <select id="getCompareListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelParamVO">
+        SELECT pmpi.index_name, pmpi.`name`, pmpi.`value`
+        FROM product_model_params pmp
+                 INNER JOIN product_model_params_item pmpi ON pmp.id = pmpi.model_params_id
+        WHERE pmp.model_id = #{modelId}
+          AND pmp.state = 1
+          AND pmpi.compare = 1
+          AND pmpi.language_code = #{language}
+        ORDER BY pmpi.id
+    </select>
 </mapper>
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
index 6b214021..ccb3704e 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
@@ -31,7 +31,7 @@
         FROM product_series ps
                  LEFT JOIN product_series_info psi ON psi.series_id = ps.id AND psi.language_code = #{language}
         WHERE ps.state = 1 AND ps.enable = 1 AND ps.module_id = #{moduleId}
-        ORDER BY ps.sort DESC
+        ORDER BY ps.sort
     </select>
 
     <select id="copyItems">