Merge branch 'hotfix-42384-dsx' into test

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

@@ -847,7 +847,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             }
         }
         if(Objects.nonNull(shootCount) && shootCount > 0){
-            if(scenePlusExt.getLocation() == 6){
+            if(Objects.nonNull(scenePlusExt.getLocation()) && scenePlusExt.getLocation() == 6){
                 mixture = CommonStatus.YES.code().intValue();
             }
         }else{