From 4dd7eab60c500a58983a187a80b23dcf8a97116b Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 27 一月 2026 17:21:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 2 +-
1 files changed, 1 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 a3ea189..2dcb35b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
@@ -86,7 +86,7 @@
group by project_id
order by create_time desc
) result on t1.id = result.project_id
- where t1.deleted = 0 and t2.deleted = 0
+ where t1.deleted = 0 and t1.status =1 and t1.type!=2 and t1.client_id =#{query.clientId}
<if test="query.projectId != null">
and t1.id = #{query.projectId}
--
Gitblit v1.7.1