From 48e8e81666b2d0f49b931cb7b93729355758f2ae Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 24 九月 2026 19:24:02 +0800
Subject: [PATCH] fix(aftersalesservice): 解决售后工单查询中的空指针异常
---
src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java b/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
index 05d5792..0d521c9 100644
--- a/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
@@ -4,8 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.ProductModel;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
+import com.ruoyi.basic.vo.ProductModelVo;
+import com.ruoyi.procurementrecord.bean.dto.ProcurementPageDto;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
/**
@@ -16,10 +21,24 @@
*/
public interface ProductModelMapper extends BaseMapper<ProductModel> {
- IPage<ProductModel> listPageProductModel(Page<ProductModel> page, @Param("c") ProductModel productModel);
+ IPage<ProductModelVo> listPageProductModel(Page<ProductModelVo> page, @Param("c") ProductModel productModel);
IPage<ProductModel> listPageProductionStock(Page<ProductModel> page, @Param("req") ProcurementPageDto req);
ProductModel selectLatestRecord();
+ List<Map<String, Object>> getProductAndModelList();
+
+ /**
+ * 鎸変骇鍝佸悕绉� + 瑙勬牸鍨嬪彿鏌ヨ浜у搧鍨嬪彿
+ *
+ * @param productName 浜у搧鍚嶇О
+ * @param model 瑙勬牸鍨嬪彿
+ * @return 浜у搧鍨嬪彿锛堝彇绗竴鏉★級
+ */
+ @Select("select pm.id, pm.product_id, pm.model, pm.unit from product_model pm " +
+ "left join product p on pm.product_id = p.id " +
+ "where p.product_name = #{productName} and pm.model = #{model} " +
+ "order by pm.id limit 1")
+ ProductModel selectByProductNameAndModel(@Param("productName") String productName, @Param("model") String model);
}
--
Gitblit v1.9.3