Merge branch 'release-ajkl' into test

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -186,7 +186,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             if(cameraDetailEntity.getCompanyId() != null){
                 Company company = companyService.getById(cameraDetailEntity.getCompanyId());
                 jsonObject.put("ajkData", company.getAjkData());
-                if(cameraDetailEntity.getCompanyId().longValue() == 1 || cameraDetailEntity.getCompanyId().longValue() == 14){
+                if(cameraDetailEntity.getCompanyId().longValue() == 1 || cameraDetailEntity.getCompanyId().longValue() == 14 || company.getAjkData() == 1){
                     jsonObject.put("exclude", new ArrayList<>());
                     jsonObject.put("company", cameraDetailEntity.getCompanyId().longValue());
                 }
@@ -215,7 +215,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
                 if(cameraDetail.getCompanyId() != null){
                     Company company = companyService.getById(cameraDetail.getCompanyId());
                     jsonObject.put("ajkData", company.getAjkData());
-                    if(cameraDetail.getCompanyId().longValue() == 1 || cameraDetail.getCompanyId().longValue() == 14){
+                    if(cameraDetail.getCompanyId().longValue() == 1 || cameraDetail.getCompanyId().longValue() == 14 || company.getAjkData() == 1){
                         jsonObject.put("exclude", new ArrayList<>());
                         jsonObject.put("company", cameraDetail.getCompanyId().longValue());
                     }