From 60b742746f9c00a2b7d96217463d1aa0eca490d2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 16:40:32 +0800
Subject: [PATCH] feat(production): 修改xml文件

---
 src/main/resources/mapper/production/ProcessRouteMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51aa322..fc989ad 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,11 +13,11 @@
     </resultMap>
 
     <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
-        select ps.*, pm.speculative_trading_name,pm.product_id
+        select ps.*, pm.speculative_trading_name,pm.product_id,pm.model
         from process_route ps
                  left join product_model pm on ps.product_model_id = pm.id
         <where>
-            <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
+            <if test="c.speculativeTradingName != null and c.speculativeTradingName != ''">
                 and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
             </if>
         </where>

--
Gitblit v1.9.3