From a118d193a6d7304bde95a541dbf511cc196ccdf0 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Wed, 23 Apr 2025 15:09:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 IProductInfoService 和 ProductInfoMapper 中的 query 方法返回类型改为 List<ProductInfo>
- 在 OrderInfoServiceImpl 和 ProductInfoServiceImpl 中添加空值判断逻辑，避免无效查询
- 使用特殊字符串 "-23232$$$$32" 作为默认序列号，以应对极端情况
---
 .../main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java   | 2 +-
 .../java/com/ruoyi/sip/service/IProductInfoService.java     | 2 +-
 .../com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java    | 3 +++
 .../com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java  | 6 +++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java
index 63d085e7..6be1c80c 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java
@@ -66,6 +66,6 @@ public interface ProductInfoMapper
 
     List<ProductInfo> listByProductCodeList(@Param("list") List<String> productCodeList);
 
-    ProductInfo query(MaintenanceRecordsDto dto);
+    List<ProductInfo> query(MaintenanceRecordsDto dto);
 
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java
index c117478a..65b8a08d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java
@@ -62,5 +62,5 @@ public interface IProductInfoService
      */
     public int deleteProductInfoById(Long id);
 
-    ProductInfo query(MaintenanceRecordsDto dto);
+    List<ProductInfo> query(MaintenanceRecordsDto dto);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
index e2906ead..2dcb5c56 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
@@ -134,6 +134,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService
 
     @Override
     public List<OrderInfo> selectOrderInfoByMaintenance(MaintenanceRecordsDto dto) {
+        if (StringUtils.isEmpty(dto.getSerialNumber()) && StringUtils.isEmpty(dto.getProductCode())){
+            dto.setSerialNumber("-23232$$$$32");
+        }
         return orderInfoMapper.selectOrderInfoByMaintenance(dto);
     }
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java
index 76b31c87..5bfbda85 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.sip.service.impl;
 
 import java.util.List;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -95,7 +96,10 @@ public class ProductInfoServiceImpl implements IProductInfoService
     }
 
     @Override
-    public ProductInfo query(MaintenanceRecordsDto dto) {
+    public List<ProductInfo> query(MaintenanceRecordsDto dto) {
+        if (StringUtils.isEmpty(dto.getSerialNumber()) && StringUtils.isEmpty(dto.getProductCode())){
+            dto.setSerialNumber("-23232$$$$32");
+        }
         return productInfoMapper.query(dto);
     }
 }