From 885f3fae53b158660ff0fe239b352850dfa4c61e Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 21 三月 2023 14:58:23 +0800
Subject: [PATCH] 被拒绝返回数据接口

---
 src/main/resources/mapper/ReportDao.xml |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/ReportDao.xml b/src/main/resources/mapper/ReportDao.xml
index d83adb9..c5917a8 100644
--- a/src/main/resources/mapper/ReportDao.xml
+++ b/src/main/resources/mapper/ReportDao.xml
@@ -19,13 +19,13 @@
                     and r.report_materials is not null
                 </if>
                 <if test="reportParamDto.havaMaterial == 0">
-                    and r.report_materials is null
+                    and (r.report_materials is null or r.report_materials='')
                 </if>
             </if>
             <if test="reportParamDto.isInGroup != null">
                 and r.is_in_group = ${reportParamDto.isInGroup}
             </if>
-        and  r.status = 0
+        and  (r.status = 0 or r.status = 2)
         </where>
         order by  r.ctime DESC
     </select>
@@ -91,4 +91,22 @@
         ) as reporter
     </select>
 
+    <select id="selectListGroup" resultType="com.example.jz.modle.entity.Report">
+        SELECT
+            t1.*
+        FROM
+            report t1
+                LEFT JOIN group_user t2 ON t1.id = t2.user_id
+        where t1.user_id=#{id}
+        GROUP BY
+            t2.group_id
+    </select>
+    <select id="selectReportByReportId" resultType="com.example.jz.modle.entity.Report">
+        SELECT
+            *
+        FROM
+            `report`
+        WHERE id =#{id}
+    </select>
+
 </mapper>

--
Gitblit v1.8.0