From 21c22f67b526c446b9f12c2365ec9c0fcab8cec8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 17:51:09 +0800
Subject: [PATCH] 改动7.0

---
 laboratory-server/src/main/resources/mapper/InstrumentMapper.xml |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 98a6181..ab1509d 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -23,23 +23,27 @@
 
     <!--閫夋嫨璁惧-->
     <resultMap id="chooseinstumMap" type="map">
-        <id property="father_name" column="father_name"/>
-        <collection property="father" resultMap="chooseinstumTowMap" javaType="List"/>
+        <id property="id" column="cid"/>
+        <result property="name" column="father_name"/>
+        <collection property="children" resultMap="chooseinstumTowMap" javaType="List"/>
     </resultMap>
     <resultMap id="chooseinstumTowMap" type="map">
-        <id property="son_name" column="son_name"/>
-        <collection property="chldren" resultMap="chooseinstumTowsMap" javaType="List"/>
+        <id property="id" column="cid"/>
+        <result property="name" column="son_name"/>
+        <collection property="children" resultMap="chooseinstumTowsMap" javaType="List"/>
     </resultMap>
     <resultMap id="chooseinstumTowsMap" type="map">
         <id property="id" column="id"/>
         <result property="name" column="name"/>
     </resultMap>
     <select id="chooseinstum" resultMap="chooseinstumMap">
-        select instrument.id,
-               father_name,
-               son_name,
+        select c.id cid,
+            instrument.id,
+               father_name ,
+               son_name ,
                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