From 8dbbc5a22b4e7ac0d2576e1fbd0bee3b4dfd26b0 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 28 十一月 2023 11:28:51 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
index 39bd177..aec436b 100644
--- a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
@@ -149,7 +149,9 @@
t.companyId,
t.level,
t.integral,
- su.real_name reporter
+ su.real_name reporter,
+ t.integral,
+ t.level
from t_hidden_danger t
LEFT JOIN sys_users su ON su.user_id = t.createUser
LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser
@@ -184,6 +186,9 @@
<if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''">
and t.createTime BETWEEN #{startTime} and #{endTime}
</if>
+ <if test="createUser!= null and createUser != ''">
+ and t.createUser =#{createUser}
+ </if>
order by t.createTime desc
</select>
@@ -214,6 +219,9 @@
<if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''">
and t.createTime BETWEEN #{startTime} and #{endTime}
</if>
+ <if test="createUser!= null and createUser != ''">
+ and t.createUser =#{createUser}
+ </if>
ORDER BY
t.auditStatus,
case when t.auditStatus = 0 then t.createTime END,
--
Gitblit v1.9.3