From 2504fa66edf977f68422c24437c22a471c190b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 2 Jul 2025 17:28:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E4=B8=8B=E6=8B=89=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E7=B3=BB=E5=88=97=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ProductTypeMapper.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
index 60af77ca..974f375f 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
@@ -80,7 +80,7 @@
     <select id="getSimpleList" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSimpleVO">
         select distinct name,batch_number
         from product_type
-        where enable=1 and state!=2
+        where enable=1 and state!=2 and series_number=#{seriesNumber}
     </select>
 
     <select id="getSimpleListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductTypeSimpleVO">

From 2c530f4a4e3abcead9571a5670620675eb7abbb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 4 Jul 2025 16:25:59 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E7=9A=84=E4=B8=80=E4=B8=AA=E5=A4=9A=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/service/impl/ProductModelParamsServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 af195c9f..d5be68ab 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
@@ -192,7 +192,7 @@ public class ProductModelParamsServiceImpl extends ServiceImpl<ProductModelParam
         }
         List<ProductModelParamsItem> datas=productModelParamsItemService.lambdaQuery()
                 .eq(ProductModelParamsItem::getModelParamsId, info.getId())
-                .eq(ProductModelParamsItem::getLanguageCode, Constant.DEFAULT_LANGUAGE_CODE)
+                .eq(ProductModelParamsItem::getLanguageCode, language)
                 .list();
         Map<String, List<ProductModelParamsItem>> maps = datas.stream().collect(Collectors.groupingBy(ProductModelParamsItem::getIndexName));
         List<ProductModelMainParamsItemChildrenVO> vos = new ArrayList<>();

From ddaa2879bc3ffc6c46786569437539a35e379dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 7 Jul 2025 13:44:47 +0800
Subject: [PATCH 3/6] =?UTF-8?q?chore:=20auth=E5=92=8Cproduct=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nflg-mobilebroken-auth/pom.xml    | 53 +++++++++++++++++++++++++-
 nflg-mobilebroken-product/pom.xml | 62 ++++++++++++++++++++++++++-----
 2 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/nflg-mobilebroken-auth/pom.xml b/nflg-mobilebroken-auth/pom.xml
index 9aa22e75..411caf5d 100644
--- a/nflg-mobilebroken-auth/pom.xml
+++ b/nflg-mobilebroken-auth/pom.xml
@@ -69,11 +69,60 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot.version}</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <excludeGroupIds>${project.groupId}</excludeGroupIds>
+                            <includeScope>runtime</includeScope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.nflg.mobilebroken.auth.AuthApplication</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>${project.groupId}:*</include>
+                                </includes>
+                            </artifactSet>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/nflg-mobilebroken-product/pom.xml b/nflg-mobilebroken-product/pom.xml
index 0846f229..d226587a 100644
--- a/nflg-mobilebroken-product/pom.xml
+++ b/nflg-mobilebroken-product/pom.xml
@@ -69,19 +69,61 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>11</source>
-					<target>11</target>
+					<skip>true</skip>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+							<excludeGroupIds>${project.groupId}</excludeGroupIds>
+							<includeScope>runtime</includeScope>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+							<mainClass>com.nflg.mobilebroken.product.ProductApplication</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes>
+									<include>${project.groupId}:*</include>
+								</includes>
+							</artifactSet>
+							<createDependencyReducedPom>false</createDependencyReducedPom>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

From ea8749f8174710c4e68edfd9f261d7e0da3a9425 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 4/6] =?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         |  3 ++-
 .../resources/mapper/ProductModelParamsMapper.xml     | 11 +++++++++++
 .../src/main/resources/mapper/ProductSeriesMapper.xml |  2 +-
 6 files changed, 23 insertions(+), 2 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 575b7329..9c0da3ad 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
@@ -31,4 +31,6 @@ public interface ProductModelParamsMapper extends BaseMapper<ProductModelParams>
     List<ParamsSortListVO> getImportantParamsListForSort(Integer paramId, String language);
 
     List<ProductParamsItemVO> getImportantListByLanguage(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 825581b0..293abb8b 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
@@ -64,4 +64,6 @@ public interface IProductModelParamsService extends IService<ProductModelParams>
     void saveImportantSort(@Valid ParamsSortSaveRequest request);
 
     List<ProductParamsItemVO> getImportantListByLanguage(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 3a32eeaf..48a9156e 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
@@ -289,4 +289,9 @@ public class ProductModelParamsServiceImpl extends ServiceImpl<ProductModelParam
     public List<ProductParamsItemVO> getImportantListByLanguage(Integer modelId, String language) {
         return baseMapper.getImportantListByLanguage(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 050cc54a..399e9304 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
@@ -198,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()
@@ -410,6 +411,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 d589a9de..9920a93c 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
@@ -65,4 +65,15 @@
           AND pmpi.language_code = #{language}
         ORDER BY pmpi.important_sort
     </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">

From b47600b88b59b6511921c29d4fc73e7d74f73a0d 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 5/6] =?UTF-8?q?feat:=20=E6=9C=BA=E5=9E=8B=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E7=B3=BB=E5=88=97?=
 =?UTF-8?q?=E5=8F=B7=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 751c6897..cf92f9af 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
@@ -146,10 +146,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 399e9304..101284e3 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
@@ -356,7 +356,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)
@@ -365,7 +365,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 456e27ae..d9dc27f4 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>

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

---
 .../mobilebroken/admin/controller/ProductTypeController.java | 5 +++--
 .../mobilebroken/repository/mapper/ProductTypeMapper.java    | 2 +-
 .../mobilebroken/repository/service/IProductTypeService.java | 2 +-
 .../repository/service/impl/ProductTypeServiceImpl.java      | 4 ++--
 .../src/main/resources/mapper/ProductTypeMapper.xml          | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java
index 13c5892d..d69eb086 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/ProductTypeController.java
@@ -105,10 +105,11 @@ public class ProductTypeController extends ControllerBase{
 
     /**
      * 获取类型列表用于排序
+     * @param seriesNumber 系列批次号
      */
     @GetMapping("/getTypeListForSort")
-    public ApiResult<List<ProductTypeSearchVO>> getTypeListForSort(){
-        return ApiResult.success(productTypeService.getListForSort());
+    public ApiResult<List<ProductTypeSearchVO>> getTypeListForSort(@Valid @RequestParam @NotNull String seriesNumber){
+        return ApiResult.success(productTypeService.getListForSort(seriesNumber));
     }
 
     /**
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java
index 4502ee1e..aaa472b7 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductTypeMapper.java
@@ -33,5 +33,5 @@ public interface ProductTypeMapper extends BaseMapper<ProductType> {
 
     List<ProductTypeSimpleVO> getSimpleListByLanguage(String batchNumber, String language);
 
-    List<ProductTypeSearchVO> getListForSort();
+    List<ProductTypeSearchVO> getListForSort(String seriesNumber);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java
index f6568db2..02ee84cc 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductTypeService.java
@@ -40,7 +40,7 @@ public interface IProductTypeService extends IService<ProductType> {
 
     void deleteByParent(String name);
 
-    List<ProductTypeSearchVO> getListForSort();
+    List<ProductTypeSearchVO> getListForSort(String seriesNumber);
 
     void saveSort(SortSaveRequest request);
 
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java
index ac58a811..1315e4af 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java
@@ -266,8 +266,8 @@ public class ProductTypeServiceImpl extends ServiceImpl<ProductTypeMapper, Produ
     }
 
     @Override
-    public List<ProductTypeSearchVO> getListForSort() {
-        return baseMapper.getListForSort();
+    public List<ProductTypeSearchVO> getListForSort(String seriesNumber) {
+        return baseMapper.getListForSort(seriesNumber);
     }
 
     @Transactional
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
index 974f375f..d3580615 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
@@ -97,7 +97,7 @@
         select *
         ,(SELECT `name` FROM product_series WHERE batch_number=series_number AND state!=2 ORDER BY state DESC LIMIT 1) as 'seriesName'
         from product_type
-        where enable=1 and state=1
+        where enable=1 and state=1 and series_number=#{seriesNumber}
         order by seriesName, sort
     </select>
 </mapper>