#

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -510,7 +510,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     public R<List<DeviceInfoDto.Vo>> list(DeviceInfoDto.ListDto dto) {
         List<DeviceInfo> list = list(new LambdaQueryWrapper<DeviceInfo>()
                 .in(CollUtil.isNotEmpty(dto.getDeviceIds()), DeviceInfo::getDeviceId, dto.getDeviceIds())
-                .eq(Emptys.check(dto.getMercId()),DeviceInfo::getMercId,dto.getMercId())
+                .eq(Emptys.check(dto.getMercId()), DeviceInfo::getMercId, dto.getMercId())
         );
         return R.ok(copy(DeviceInfoDto.Vo.class, list));
     }
@@ -686,7 +686,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 if (netState == null) {
                     device.setNetStateName(StrUtil.EMPTY);
                 } else {
-                    device.setNetStateName(DeviceNetSateType.getEnumByCode(deviceStatus.getNetState()).getDescription());
+                    device.setNetStateName(DeviceNetSateType.getEnumByCode(netState).getDescription());
                 }
 
                 Integer deviceStateL = deviceStatus.getLockStateL();