增加非空校验

4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -3082,7 +3082,6 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         return url;
     }
 
-
     @Override
     public String downloadVideo(DownloadVideoParam downloadVideoParam) throws Exception {
         String fileName = downloadVideoParam.getPlanId() + ".mp4";
@@ -3558,10 +3557,13 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
                 camera.setId(responseScene.getDepartmentId());
                 Result departmentData = departmentFeign.findById(camera);
                 ObjectMapper objectMapper = new ObjectMapper();
-                log.info("department.findById:" + departmentData.getData().toString());
+//                log.info("department.findById:" + departmentData.getData().toString());
                 ResponseDepartment obj = objectMapper.convertValue(departmentData.getData(), ResponseDepartment.class);
 
-                responseScene.setDepartmentName(obj.getName());
+                if(obj!=null && obj.getName()!=null){
+                    responseScene.setDepartmentName(obj.getName());
+                }
+
             }
             data.add(responseScene);
         }