From ed0397e9ca57778e1341b73c5b146b8d6cf6b486 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 25 Jul 2025 16:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsource=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/ScenicDeviceStatsMapper.xml | 4 ++--
 src/main/resources/mapper/SourceMapper.xml            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/ScenicDeviceStatsMapper.xml b/src/main/resources/mapper/ScenicDeviceStatsMapper.xml
index 89e59e6..acabb20 100644
--- a/src/main/resources/mapper/ScenicDeviceStatsMapper.xml
+++ b/src/main/resources/mapper/ScenicDeviceStatsMapper.xml
@@ -22,7 +22,7 @@
             select s.scenic_id, s.device_id
             from member_source ms
             left join source s on ms.source_id = s.id
-            where ms.type = 1
+            where ms.type = 1 and s.id is not null
             and s.create_time >= #{start}
             and s.create_time &lt;= #{end}
             group by s.scenic_id, s.device_id, ms.face_id
@@ -59,7 +59,7 @@
                           select s.scenic_id, s.device_id
                           from member_source ms
                                    left join source s on ms.source_id = s.id
-                          where ms.type = 2
+                          where ms.type = 2 and s.id is not null
                             and s.create_time >= #{start}
                             and s.create_time &lt;= #{end}
                           group by s.scenic_id, s.device_id, ms.face_id
diff --git a/src/main/resources/mapper/SourceMapper.xml b/src/main/resources/mapper/SourceMapper.xml
index 6af2c70..e3043ce 100644
--- a/src/main/resources/mapper/SourceMapper.xml
+++ b/src/main/resources/mapper/SourceMapper.xml
@@ -94,7 +94,7 @@
         from member_source ms
                  left join source so on ms.source_id = so.id
                  left join scenic sc on sc.id = so.scenic_id
-        where so.id = #{id} and ms.member_id = #{userId}
+        where so.id = #{id} and ms.member_id = #{userId} and so.id is not null
     </select>
     <select id="getById" resultType="com.ycwl.basic.model.pc.source.resp.SourceRespVO">
         select so.id, scenic_id, device_id, url, video_url, so.create_time, so.update_time,sc.`name` as scenicName
@@ -158,7 +158,7 @@
         from member_source ms
         left join source so on ms.source_id = so.id
         left join scenic sc on sc.id = so.scenic_id
-        where ms.member_id = #{userId} and ms.source_id = #{sourceId}
+        where ms.member_id = #{userId} and ms.source_id = #{sourceId} and so.id is not null
         limit 1
     </select>
     <select id="queryByRelation" resultType="com.ycwl.basic.model.pc.source.resp.SourceRespVO">
@@ -167,7 +167,7 @@
                  left join source so on ms.source_id = so.id
                  left join scenic sc on sc.id = so.scenic_id
         where
-            ms.member_id = #{memberId}
+            ms.member_id = #{memberId} and so.id
             <if test="faceId!= null">and ms.face_id = #{faceId} </if>
             <if test="type!=null">and ms.type = #{type} </if>
             <if test="scenicId!= null">and ms.scenic_id = #{scenicId} </if>