From 00957f0c836b80d9052a6ccf673d3b454b646081 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 29 九月 2025 18:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
index 1c952cd..ce31a5a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
@@ -38,8 +38,8 @@
<if test="query.status != null">
AND status = #{query.status}
</if>
- <if test="query.reportType != null">
- AND report_type = #{query.reportType}
+ <if test="query.reportType != null and query.query.reportUserId !=null">
+ AND report_type = #{query.reportType} and report_user_id =#{query.reportUserId}
</if>
<if test="query.createBy != null and query.createBy != ''">
AND create_by LIKE concat('%',#{query.createBy},'%')
--
Gitblit v1.7.1