lyhzzz 3 лет назад
Родитель
Сommit
e4b06dccd3
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

+ 2 - 1
src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

@@ -133,7 +133,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(!oldCameraDetail.getType().equals(cameraDetail.getType())){
         if(!oldCameraDetail.getType().equals(cameraDetail.getType())){
             throw new BusinessException(ResultCode.CAMERA_TYPE_NOT_ERROR);
             throw new BusinessException(ResultCode.CAMERA_TYPE_NOT_ERROR);
         }
         }
-        if(!oldCameraDetail.getAgentId().equals(cameraDetail.getAgentId()) ){
+        if(oldCameraDetail.getAgentId() == null || cameraDetail.getAgentId() == null ||
+        !oldCameraDetail.getAgentId().equals(cameraDetail.getAgentId()) ){
             throw new BusinessException(ResultCode.CAMERA_SN_ERROR);
             throw new BusinessException(ResultCode.CAMERA_SN_ERROR);
         }
         }