From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/MaterialMapper.xml | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index e2f4825..e879a4e 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -58,19 +58,9 @@
FROM material m
LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s
ON s.material_id = m.`id`
- LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1
- <if test="specificationsName != null and specificationsName != ''">
- AND f.`name` = #{specificationsName}
- </if>) f
+ LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1) f
ON f.standard_id = s.id
WHERE m.`state` = 1
</select>
-
- <!--娣诲姞鏍囧噯閫夋嫨鏍峰搧鍚嶇О-->
- <select id="selectmater" resultType="java.lang.String">
- select name
- from lims_laboratory.material
- where state = 1
- </select>
</mapper>
--
Gitblit v1.9.3