From 94ad6d1f5ab10362a08f9e430c8eaf9f885411ff Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 10 Aug 2026 21:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BE=9D=E7=84=B6=E4=B8=8D=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=20=E5=AE=8C=E5=85=A8=E9=87=8D=E5=86=99=E7=BB=95=E5=BC=80IP?=
 =?UTF-8?q?=E5=92=8CMAC=E7=9A=84=E5=8F=98=E6=9B=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/EpsInitialTrafficDataMapper.xml    | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 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 c7f9629..82354a2 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
@@ -599,20 +599,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM ${tableName} a
         <!-- 动态关联表 -->
         <if test="mac == null or mac == ''">
-            INNER JOIN  (
-            SELECT
-            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
-            AND a.interface_name = b.parent_interface
-            where
-            (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.ipV4 = b.ipV4
+            LEFT JOIN rm_network_interface b ON a.client_id = b.client_id
         </if>
         <where>
+            <if test="mac == null or mac == ''">
+                and (b.bind_ip = 1 or b.bind_ip = 3)
+                and a.ipV4 IS NOT NULL
+                and a.ipV4 != ''
+                and NOT (a.total_in_speed = 0 and a.total_out_speed = 0)
+            </if>
             <if test="serviceSn != '' and serviceSn != null">
                 and a.service_sn = #{serviceSn}
             </if>