From 22d0e9a68cd2f8a129742618e54d66cba7d7114f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 16 六月 2025 19:36:51 +0800
Subject: [PATCH] 修复机床回传文件分页
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
index 99aa24b..b95dd1d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml
@@ -14,7 +14,14 @@
<select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
select f.id,f.filename,f.create_time,m.code machineCode,m.name machineName
from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
- ${ew.customSqlSegment}
+ <if test="query.machineSpec!=null and query.machineSpec!=''">
+ and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
+ </if>
+ <if test="query.keyword!=null and query.keyword!=''">
+ and (m.code like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%') or m.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
+ or f.filename like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
+ )
+ </if>
</select>
--
Gitblit v1.9.3