From a69514f8ffd299a256500b5b704e320598c1ab43 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 28 一月 2026 13:49:07 +0800
Subject: [PATCH] 代码提交
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java | 2 ++
ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
index 4818c1c..dfd82ac 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java
@@ -14,6 +14,8 @@
private Integer id;
@ApiModelProperty("项目名称")
private String projectName;
+ @ApiModelProperty("委托方id")
+ private Integer clientId;
@ApiModelProperty("设备类型：1-塔式起重机 2-施工升降机 3-物料提升机 4-桥式起重机 5-附着式升降脚手架 6-流动式起重机 7-高处作业吊篮 8-门式起重机 9-架桥机 10-其他")
private Integer type;
@ApiModelProperty("设备编号")
diff --git a/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml
index 1c6e139..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,7 @@
group by device_id
) latest on t2.id = latest.device_id
left join project t3 on t1.project_id = t3.id
- where 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>
--
Gitblit v1.7.1