From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/WorkInjuryDeclarationInfoMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/WorkInjuryDeclarationInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/WorkInjuryDeclarationInfoMapper.xml
index 169bef9..2005b8b 100644
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/WorkInjuryDeclarationInfoMapper.xml
+++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/WorkInjuryDeclarationInfoMapper.xml
@@ -28,8 +28,8 @@
FROM
work_injury_declaration a
LEFT JOIN accident_express b ON a.accident_express_id = b.id
- WHERE
- a.del_flag = 0
+ WHERE
+ a.del_flag = 0
<if test="query.accidentExpressId != null">and a.`accident_express_id` = #{query.accidentExpressId}</if>
</select>
@@ -115,7 +115,7 @@
FROM
work_injury_declaration a
LEFT JOIN accident_express b ON a.accident_express_id = b.id
- WHERE del_flag = 0 and id = #{id}
+ WHERE a.del_flag = 0 and a.id = #{id}
</select>
<update id="updateWorkInjuryDeclaration" parameterType="com.gkhy.safePlatform.incidentManage.entity.WorkInjuryDeclarationInfo">
--
Gitblit v1.9.2