From 1ab5a65898b12ca07cbf38eaf2028eeae2ce790c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 10:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 2bd4204..ab1509d 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -23,7 +23,8 @@
<!--閫夋嫨璁惧-->
<resultMap id="chooseinstumMap" type="map">
- <id property="name" column="father_name"/>
+ <id property="id" column="cid"/>
+ <result property="name" column="father_name"/>
<collection property="children" resultMap="chooseinstumTowMap" javaType="List"/>
</resultMap>
<resultMap id="chooseinstumTowMap" type="map">
@@ -43,5 +44,6 @@
equipment_name name
from lims_laboratory.instrument
left join lims_laboratory.classify c on c.id = instrument.classify_id
+ where conditions in(1,5)
</select>
</mapper>
--
Gitblit v1.9.3