From 661d3c6bd42733aeb0ca83aee72f6b83bef4de36 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 18 三月 2026 16:30:56 +0800
Subject: [PATCH] fix(sales): 修复导出合同文件名编码及空指针问题
---
src/main/resources/mapper/production/ProductProcessMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 5b1ac18..9213760 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -4,9 +4,11 @@
<select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
SELECT
- *
+ p.*,
+ dl.device_name AS deviceName
FROM
product_process p
+ left join device_ledger dl on p.device_ledger_id = dl.id
<where>
<if test="productProcessDto.name != null and productProcessDto.name != '' ">
AND p.name LIKE CONCAT('%',#{productProcessDto.name},'%')
--
Gitblit v1.9.3