From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

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

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml
index 0b1ef26..cc82244 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml
@@ -30,6 +30,9 @@
         LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid"
         LEFT JOIN SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid"
         where 1 =1
+        <if test="hkEvent.resGuid!=null and hkEvent.resGuid!=''">
+            and awb."res_guid" = #{hkEvent.resGuid}
+        </if>
         <if test="hkEvent.srcName!=null and hkEvent.srcName!=''">
             and she.src_name like concat('%',#{hkEvent.srcName},'%')
         </if>

--
Gitblit v1.9.3