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().eq(GpsEquipment::getClientId, bo.getClientId())); GpsManmachine gpsManmachine = gpsManmachineMapper.selectOne(new LambdaQueryWrapper().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 {