hechunping преди 2 години
родител
ревизия
effbca851f
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

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

@@ -141,7 +141,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 .in(DeviceInfo::getDeviceId, dto.getDeviceId())
                 .select(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName);
         List<DeviceInfo> deviceInfoList = list(lqw);
-        return R.ok(deviceInfoList.stream().collect(Collectors.toMap(DeviceInfo::getDeviceId, DeviceInfo::getDeviceName)));
+        return R.ok(deviceInfoList.stream().collect(Collectors.toMap(DeviceInfo::getDeviceId, i->Optional.ofNullable(i.getDeviceName()).orElse(""))));
     }
 
     @Override