From c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 10:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/resources/mapper/SealMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml
index c1e4380..0e1dc5f 100644
--- a/cnas-server/src/main/resources/mapper/SealMapper.xml
+++ b/cnas-server/src/main/resources/mapper/SealMapper.xml
@@ -4,14 +4,16 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.mom.mapper.SealMapper">
     <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
-        select * from seal
+        select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time
+        from seal s  LEFT JOIN laboratory l  on s.lab_id=l.id
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
+
     </select>
     <select id="selectLaboratory" resultType="com.yuanchu.mom.pojo.Laboratory">
         SELECT *
         from laboratory
-        WHERE id =#{labId}
+        WHERE id = #{labId}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3