Merge branch 'feature-v4.10.0-20230714-dsx' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -316,9 +316,11 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
         String logoPath = null;
         if(Objects.nonNull(scenePro.getCameraId())){
             CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePro.getId());
-            Company company = companyService.getById(cameraDetail.getCompanyId());
-            if(Objects.nonNull(company) && StrUtil.isNotEmpty(company.getQrLogo())){
-                logoPath =  ConstantFilePath.BASE_PATH + File.separator + company.getQrLogo();
+            if(Objects.nonNull(cameraDetail) && Objects.nonNull(cameraDetail.getCompanyId())){
+                Company company = companyService.getById(cameraDetail.getCompanyId());
+                if(Objects.nonNull(company) && StrUtil.isNotEmpty(company.getQrLogo())){
+                    logoPath =  ConstantFilePath.BASE_PATH + File.separator + company.getQrLogo();
+                }
             }
         }