From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml
index 9a4f98e..aee5ca4 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/ParaMillToolMapper.xml
@@ -9,7 +9,8 @@
t2.classify_id AS classifyNum,
t2.type_name AS classifyName,
t1.id AS toolId,
- t.tool_code AS toolCode,
+ t1.tool_code AS toolCode,
+ t1.parama_table_name AS paramaTableName,
t.sign_code AS signCode,
t.chinese_name AS chineseName,
t.foreign_language_name AS foreignLanguageName,
@@ -53,13 +54,6 @@
FROM tms_para_mill_tool t
LEFT JOIN tms_base_tools t1 on t.tool_code = t1.id
LEFT JOIN tms_tools_classify t2 on t.classify_id = t2.id
- <where>
- <if test="classifyId != null and classifyId != ''">
- AND t.classify_id = #{classifyId}
- </if>
- <if test="diameter != null and diameter != ''">
- AND t.diameter = #{diameter}
- </if>
- </where>
+ ${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3