From 2dcf1afe7f0f0a466718f82ad2ccc7540180dd1d Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Wed, 18 Dec 2024 18:15:46 +0800
Subject: [PATCH] fix: cdr record

---
 .../java/org/wfc/user/service/impl/UCdrServiceImpl.java     | 6 ++++--
 .../src/main/resources/mapper/user/UCdrMapper.xml           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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 0658e48..2ab71f3 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
@@ -110,8 +110,10 @@ public class UCdrServiceImpl extends ServiceImpl<UCdrMapper, UCdr> implements IU
             }
             for (UClient client : allClients) {
                 UCdr uCdr = this.getOne(Wrappers.<UCdr>lambdaQuery().eq(UCdr::getUserId, client.getUserId())
-                        .eq(UCdr::getClientId, client.getId()));
-                addCdrHistory(site, client.getClientMac(), uCdr.getId());
+                        .eq(UCdr::getClientId, client.getId()), false);
+                if (ObjectUtil.isNotNull(uCdr)) {
+                    addCdrHistory(site, client.getClientMac(), uCdr.getId());
+                }
             }
         }
     }
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 d511b6b..07b8256 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
@@ -76,7 +76,7 @@
 
     <select id="getHistoryByUser" resultType="org.wfc.user.domain.vo.UCdrHistoryUserVo">
         SELECT
-            cdr.client_id id,
+            ch.id,
             c.client_name,
             c.client_mac,
             c.client_device_type,