|
@@ -1089,7 +1089,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
.eq(BaseDeviceResume::getCameraCode, cameraCode)
|
|
.eq(BaseDeviceResume::getCameraCode, cameraCode)
|
|
.eq(BaseDeviceResume::getIsDisable, status));
|
|
.eq(BaseDeviceResume::getIsDisable, status));
|
|
|
|
|
|
- boolean shouldDisable = (status == 1) || (deviceDynamicManagement != null && (status == 2 && deviceDynamicManagement.getIsDisable().equals(1)));
|
|
|
|
|
|
+ boolean shouldDisable = (status == 1) || (!ObjectUtils.isEmpty(deviceDynamicManagement) && (status == 2 && deviceDynamicManagement.getIsDisable().equals(1)));
|
|
|
|
|
|
BaseDeviceResume resume = new BaseDeviceResume();
|
|
BaseDeviceResume resume = new BaseDeviceResume();
|
|
resume.setCameraCode(cameraCode);
|
|
resume.setCameraCode(cameraCode);
|