From da30df12fc02f28a4b016c8c35a3b57e5c29fe35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index 83edc6b..8488506 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductModelMapper">
<resultMap id="selectproductModelMap" type="map">
- <id property="father" column="father"/>
+ <id property="name" column="father"/>
<collection property="children" resultMap="selectproductModelTowMap" javaType="List"/>
</resultMap>
@@ -37,8 +37,7 @@
<select id="selectfather" resultType="java.lang.String">
SELECT DISTINCT father
FROM lims_laboratory.product_model
- WHERE father IS NOT NULL
- AND father != ''
+ WHERE state = 1
</select>
<!--鏌ヨ椤圭洰妯＄増鏍规嵁鏍峰搧鍚�-->
@@ -48,6 +47,13 @@
unit
from lims_laboratory.product_model
where state = 1
- and material =#{name}
+ and material = #{name}
+ </select>
+
+ <!--娣诲姞鏍囧噯閫夋嫨鏍峰搧鍚嶇О-->
+ <select id="selectmater" resultType="java.lang.String">
+ select material
+ from lims_laboratory.product_model
+ where state = 1
</select>
</mapper>
--
Gitblit v1.9.3