From cf347859a3a023f48bdb82e7702c0df8858759db Mon Sep 17 00:00:00 2001 From: “zhuo” <“zhuo@itcast.cn”> Date: 星期四, 10 八月 2023 13:13:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspection-server/src/main/resources/mapper/ReportMapper.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml index 54d2f39..2beac5c 100644 --- a/inspection-server/src/main/resources/mapper/ReportMapper.xml +++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml @@ -39,6 +39,9 @@ join inspection i on r.inspection_id = i.id join inspection_material im on i.id = im.inspection_id <where> + <if test="status == null"> + and r.status in (0, 1) + </if> <if test="status != null"> and r.status = #{status} </if> -- Gitblit v1.9.3