From c968f678ea03f7fd0a9071b63e60c144f63da380 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:01 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-21
---
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 9 +++++----
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
index e3f3a1d..e94e131 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
@@ -39,7 +39,7 @@
@ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "鐭冲ご", required = true)
private String name;
- @ApiModelProperty(value = "0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱2锛氬崐鎴愬搧", example = "1")
+ @ApiModelProperty(value = "0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱", example = "1")
private Integer type;
@TableLogic(value = "1", delval = "0")
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index bc6f8cd..72ad32f 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -26,9 +26,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>
<!--鏌ヨ椤圭洰妯＄増鏍规嵁鏍峰搧鍚�-->
@@ -40,4 +41,4 @@
where state = 1
and material =#{name}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3