From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 22 七月 2024 19:59:10 +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