From afdeb7116d31cd5f5c4d36fab37f14ed8f0c2595 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 7 Aug 2026 14:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=B1mac=E6=94=B9=E6=88=90ip=20=E5=9B=A0?= =?UTF-8?q?=E4=B8=BAmac=E6=98=AF=E8=99=9A=E6=8B=9F=E7=9A=84=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E5=90=8E=E4=BC=9A=E5=8F=98=20=E4=B8=8D=E7=A8=B3?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/system/EpsInitialTrafficDataMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml index 9a2545a..c7f9629 100644 --- a/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml @@ -601,7 +601,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN ( SELECT - a.client_id,ifnull(b.mac_address,a.mac_address) mac_address + a.client_id,ifnull(b.mac_address,a.mac_address) mac_address,b.ipv4_address ipV4 FROM rm_network_interface a LEFT JOIN rm_network_interface_child b on b.ipv4_address!='' and b.ipv4_address!='N/A' and a.client_id = b.client_id @@ -610,7 +610,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (a.bind_ip = 1 OR a.bind_ip = 3) AND a.new_flag = 1 and a.client_id = #{clientId} ) b - ON a.client_id = b.client_id and a.mac = b.mac_address + ON a.client_id = b.client_id and a.ipV4 = b.ipV4