gao.qiang пре 1 недеља
родитељ
комит
e10a219302
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1 1
      hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -1089,7 +1089,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                             .eq(BaseDeviceResume::getCameraCode, cameraCode)
                             .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();
             resume.setCameraCode(cameraCode);