异物侵限报警修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -481,11 +481,13 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setCardNum(baseCameraManagement.getCardNum());
             msgAlarmResp.setCameraSn(baseCameraManagement.getCameraSn());
             BaseCameraVersion baseCameraVersion = baseCameraVersionMapper.selectById(baseCameraManagement.getId());
-            if (!StringUtils.isEmpty(baseCameraVersion.getVersionName())){
-            msgAlarmResp.setVersionName(baseCameraVersion.getVersionName());
-            }
-            if (!StringUtils.isEmpty(baseCameraVersion.getVersionNum())) {
-                msgAlarmResp.setVersionNum(baseCameraVersion.getVersionNum());
+            if (!ObjectUtils.isEmpty(baseCameraVersion)) {
+                if (!StringUtils.isEmpty(baseCameraVersion.getVersionName())) {
+                    msgAlarmResp.setVersionName(baseCameraVersion.getVersionName());
+                }
+                if (!StringUtils.isEmpty(baseCameraVersion.getVersionNum())) {
+                    msgAlarmResp.setVersionNum(baseCameraVersion.getVersionNum());
+                }
             }
             return AjaxResult.success(msgAlarmResp);
         } else {