From d7616960c6c31b1f7c478ce4c109d190e2d82d79 Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Sat, 6 Sep 2025 18:48:39 +0800
Subject: [PATCH] =?UTF-8?q?gpsbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/dromara/gps/domain/vo/GpsUserVo.java      | 2 ++
 .../org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/domain/vo/GpsUserVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/domain/vo/GpsUserVo.java
index ec673214..61c4cbfc 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/domain/vo/GpsUserVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/domain/vo/GpsUserVo.java
@@ -49,5 +49,7 @@ public class GpsUserVo implements Serializable {
      */
     private String projectName;
 
+    private String clientId;
+
 
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java
index 9b6012f9..fd72aaa3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java
@@ -358,6 +358,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl<GpsEquipmentMapper, Gps
 //        GpsEquipment gpsEquipment = baseMapper.selectOne(new LambdaQueryWrapper<GpsEquipment>().eq(GpsEquipment::getClientId, bo.getClientId()));
         GpsManmachine gpsManmachine = gpsManmachineMapper.selectOne(new LambdaQueryWrapper<GpsManmachine>().eq(GpsManmachine::getClientId, bo.getClientId()));
         for (GpsUserVo item : list) {
+            item.setClientId(bo.getClientId());
             if (gpsManmachine != null && gpsManmachine.getUserId().equals(item.getUserId())) {
                 item.setType(0);
             }else {