diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index 53c1775..12763f9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceModels; +import com.casic.missiles.modular.system.model.DeviceType; import com.casic.missiles.modular.system.service.IDeviceModelsService; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.model.response.ResponseData; @@ -55,7 +56,8 @@ Map dictMap = deviceModelsService.getDictNameByCode(); page.getRecords().forEach( deviceModels -> { - deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName()); + DeviceType deviceTypeModel = deviceTypeService.getById(deviceModels.getDeviceType()); + deviceModels.setDeviceTypeName(deviceTypeModel == null ? "" : deviceTypeModel.getTypeName()); String[] d = deviceModels.getCommunication().split(","); if (d.length > 0) { deviceModels.setCommunNameGroup(dictMap.get(d[0]));