From 0a0bbb964267bf53b35ae67dc946b7e5d1aaa8e8 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 28 一月 2026 16:26:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
index 2dcb35b..1c7fd88 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -55,7 +55,10 @@
group by device_id
) latest on t2.id = latest.device_id
left join project t3 on t1.project_id = t3.id
- where t1.project_id = #{query.projectId} and t1.deleted = 0 and t1.disabled = 0
+ where t1.deleted = 0 and t1.disabled = 0 and t3.client_id =#{query.clientId}
+ <if test="query.projectId != null">
+ and t1.project_id = #{query.projectId}
+ </if>
<if test="query.type != null">
and t2.type = #{query.type}
</if>
--
Gitblit v1.7.1