From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 15:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspection-server/src/main/resources/mapper/ReportMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 2beac5c..7983e64 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -15,6 +15,7 @@
         join user u on i.user_id = u.id
         join inspection_material im on i.id = im.inspection_id
         <where>
+            r.state = 1
             <if test="status != null">
                 and r.status = #{status}
             </if>
@@ -39,6 +40,7 @@
         join inspection i on r.inspection_id = i.id
         join inspection_material im on i.id = im.inspection_id
         <where>
+            r.state = 1
             <if test="status == null">
                 and r.status in (0, 1)
             </if>

--
Gitblit v1.9.3