From 6bb2b93bc6b7cb4ccce08f34230dfa95f29d20d8 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, 14 Jul 2025 10:39:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ProductSeriesMapper.xml           | 2 +-
 .../src/main/resources/mapper/ProductTypeMapper.xml             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
index 6b214021..8db20e6a 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
@@ -68,7 +68,7 @@
     </select>
 
     <select id="getSimpleListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSimpleVO">
-        select distinct batch_number,psi.name,sort
+        select distinct batch_number,psi.name
         from product_series ps
             inner join product_series_info psi on ps.id=psi.series_id
         where state=1 and enable=1 and module_id=#{moduleId} and psi.language_code=#{language}
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
index 8c42e2dc..7414873a 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
@@ -91,6 +91,7 @@
           and pt.enable = 1
           and pt.series_number = #{batchNumber}
           AND pti.language_code = #{language}
+        order by pt.sort
     </select>
 
     <select id="getListForSort" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductTypeSearchVO">

From 1b3e5cf7c205ab566dc135233923917533e0417e 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, 14 Jul 2025 10:45:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
index 8db20e6a..b94eabfd 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
@@ -68,7 +68,7 @@
     </select>
 
     <select id="getSimpleListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductSeriesSimpleVO">
-        select distinct batch_number,psi.name
+        select distinct batch_number,psi.name,ps.sort
         from product_series ps
             inner join product_series_info psi on ps.id=psi.series_id
         where state=1 and enable=1 and module_id=#{moduleId} and psi.language_code=#{language}

From b6ec959050c02e13d83998d59c25f6ebcbf19c82 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, 14 Jul 2025 10:50:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starter/advice/GlobalRestControllerAdvice.java         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java
index c2fdd2ba..85d21e12 100644
--- a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java
+++ b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,6 +25,12 @@ import java.util.stream.Collectors;
 @Slf4j
 public class GlobalRestControllerAdvice {
 
+    @ExceptionHandler(SQLException.class)
+    public ApiResult<Void> handleSQLException(SQLException ex) {
+        log.error("数据库错误: ", ex);
+        return ApiResult.error(STATE.BusinessError,"数据库错误");
+    }
+
     @ExceptionHandler(Exception.class)
     public ApiResult<Void> handleAllExceptions(Exception ex) {
         log.error("服务器内部错误: ", ex);