From b4c7f052fd8fb63d9c4afde99f61f275515c45f6 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Tue, 17 Dec 2024 20:31:33 +0800
Subject: [PATCH] fix: cdr history

---
 .../main/java/org/wfc/user/service/impl/UCdrServiceImpl.java   | 1 +
 .../src/main/resources/mapper/user/UCdrMapper.xml              | 1 +
 .../src/main/resources/mapper/user/UClientMapper.xml           | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java
index ebc0308..0a7bd2c 100644
--- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java
+++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UCdrServiceImpl.java
@@ -156,6 +156,7 @@ public class UCdrServiceImpl extends ServiceImpl<UCdrMapper, UCdr> implements IU
                 .downPacket(client.getDownPacket())
                 .trafficDown(client.getTrafficDown())
                 .trafficUp(client.getTrafficUp())
+                .activity(client.getActivity())
                 .build();
         uCdr.setId(cdrId);
         this.saveOrUpdate(uCdr);
diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrMapper.xml b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrMapper.xml
index b854fc0..01ce75c 100644
--- a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrMapper.xml
+++ b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UCdrMapper.xml
@@ -96,6 +96,7 @@
                 AND c.del_flag = 0
         WHERE
             cdr.del_flag = 0
+            AND ch.id is not null
             <if test="userId != null and userId != ''">
                 AND cdr.user_id = #{userId}
             </if>
diff --git a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UClientMapper.xml b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UClientMapper.xml
index 37d679b..5796050 100644
--- a/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UClientMapper.xml
+++ b/wfc-modules/wfc-modules-user/src/main/resources/mapper/user/UClientMapper.xml
@@ -22,7 +22,7 @@
             <if test="userId != null and userId != ''">
                 AND cdr.user_id = #{userId}
             </if>
-          AND cdr.last_seen_time > ch.end_time
+          AND cdr.last_seen_time > ifnull( ch.end_time, 0 )
     </select>
 
     <select id="getHistoryByUser" resultType="org.wfc.user.domain.vo.UClientHistoryUserVo">
@@ -44,6 +44,7 @@
                 AND c.del_flag = 0
         WHERE
             cdr.del_flag = 0
+            AND ch.id is not null
             <if test="userId != null and userId != ''">
                 AND cdr.user_id = #{userId}
             </if>