From 8f8ba3c62d6fc9f4733a408daf59a5badd82e5e2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:42:26 +0800
Subject: [PATCH] 开发8-25人员管理与组织架构对接完成

---
 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