From 3d0545b8c59fa1993274aa89ff2cb217fc2a2ffd 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 15:01:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=BA=E5=9E=8B=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E7=B3=BB=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/ProductModelController.java             | 5 +++--
 .../mobilebroken/repository/mapper/ProductModelMapper.java   | 2 +-
 .../repository/service/IProductModelService.java             | 2 +-
 .../repository/service/impl/ProductModelServiceImpl.java     | 4 ++--
 .../src/main/resources/mapper/ProductModelMapper.xml         | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
index f6967c1e..9c3b6696 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductModelController.java
@@ -149,10 +149,11 @@ public class ProductModelController extends ControllerBase{
 
     /**
      * 获取机型列表用于排序
+     * @param typeNumber 类型系列号
      */
     @GetMapping("/getListForSort")
-    public ApiResult<List<ProductModelSearchVO>> getListForSort(){
-        return ApiResult.success(productModelService.getListForSort());
+    public ApiResult<List<ProductModelSearchVO>> getListForSort(@Valid @RequestParam @NotNull String typeNumber){
+        return ApiResult.success(productModelService.getListForSort(typeNumber));
     }
 
     /**
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java
index 8c9ffd52..8d9f3c64 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelMapper.java
@@ -28,5 +28,5 @@ public interface ProductModelMapper extends BaseMapper<ProductModel> {
 
     List<ProductModelSimpleVO> getSimpleList(String typeNumber);
 
-    List<ProductModelSearchVO> getListForSort();
+    List<ProductModelSearchVO> getListForSort(String typeNumber);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java
index 7943fcf0..51eb7f84 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelService.java
@@ -42,7 +42,7 @@ public interface IProductModelService extends IService<ProductModel> {
 
     void deleteByParent(String typeNumber);
 
-    List<ProductModelSearchVO> getListForSort();
+    List<ProductModelSearchVO> getListForSort(String typeNumber);
 
     void saveSort(SortSaveRequest request);
 
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 57cc400c..d020d1e1 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
@@ -352,7 +352,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
     }
 
     @Override
-    public List<ProductModelSearchVO> getListForSort() {
+    public List<ProductModelSearchVO> getListForSort(String typeNumber) {
 //        return Convert.toList(ProductModelSearchVO.class,
 //                lambdaQuery()
 //                        .eq(ProductModel::getEnable, true)
@@ -361,7 +361,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
 //                        .orderByAsc(ProductModel::getSort)
 //                        .list()
 //        );
-        return baseMapper.getListForSort();
+        return baseMapper.getListForSort(typeNumber);
     }
 
     @Transactional
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
index c6a2f242..3a17fabe 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
@@ -88,7 +88,7 @@
         select *
             ,(SELECT `name` FROM product_type WHERE batch_number=type_number AND state!=2 ORDER BY state DESC LIMIT 1) as 'typeName'
         from product_model
-        where enable=1 and state=1
+        where enable=1 and state=1 and type_number=#{typeNumber}
         order by typeName, sort
     </select>
 </mapper>