From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index 6af2685..83edc6b 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -35,9 +35,10 @@
</update>
<!--娣诲姞鏍囧噯閫夋嫨椤圭洰鍒嗙粍-->
<select id="selectfather" resultType="java.lang.String">
- select distinct father
- from lims_laboratory.product_model
- where state = 1
+ SELECT DISTINCT father
+ FROM lims_laboratory.product_model
+ WHERE father IS NOT NULL
+ AND father != ''
</select>
<!--鏌ヨ椤圭洰妯＄増鏍规嵁鏍峰搧鍚�-->
@@ -49,4 +50,4 @@
where state = 1
and material =#{name}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3