From f9b71f332b6a2d12151f20eeb6c68caa2a754eaa Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 05 Jul 2023 16:10:12 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
index 2e9638b..d0c896a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
@@ -38,6 +38,12 @@
         <if test="vo.operationDescription !=null and vo.operationDescription !=''">
             AND L.OPERATION_DESCRIPTION LIKE CONCAT('%',#{vo.operationDescription},'%')
         </if>
+        <if test="vo.source !=null and vo.source !=''">
+            AND L.SOURCE = #{vo.source}
+        </if>
+        <if test="vo.daterange !=null and  vo.daterange.length >  0">
+            AND L.CREATE_TIME &gt;= #{vo.daterange[0]} AND L.CREATE_TIME &lt;= #{vo.daterange[1]}
+        </if>
         ORDER BY L.CREATE_TIME DESC
     </select>
 </mapper>

--
Gitblit v1.9.3