Merge branch 'release-ajkl' into test

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

@@ -184,12 +184,11 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
             CameraDetail cameraDetailEntity = cameraDetailService.findByCameraId(camera.getId());
             if(cameraDetailEntity.getCompanyId() != null){
+                Company company = companyService.getById(cameraDetailEntity.getCompanyId());
+                jsonObject.put("ajkData", company);
                 if(cameraDetailEntity.getCompanyId().longValue() == 1 || cameraDetailEntity.getCompanyId().longValue() == 14){
                     jsonObject.put("exclude", new ArrayList<>());
                     jsonObject.put("company", cameraDetailEntity.getCompanyId().longValue());
-                    Company company = companyService.getById(cameraDetailEntity.getCompanyId());
-                    jsonObject.put("ajkData", company);
-
                 }
             }
             return result;
@@ -214,11 +213,11 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             if(camera != null){
                 CameraDetail cameraDetail = cameraDetailService.findByCameraId(camera.getId());
                 if(cameraDetail.getCompanyId() != null){
+                    Company company = companyService.getById(cameraDetail.getCompanyId());
+                    jsonObject.put("ajkData", company);
                     if(cameraDetail.getCompanyId().longValue() == 1 || cameraDetail.getCompanyId().longValue() == 14){
                         jsonObject.put("exclude", new ArrayList<>());
                         jsonObject.put("company", cameraDetail.getCompanyId().longValue());
-                        Company company = companyService.getById(cameraDetail.getCompanyId());
-                        jsonObject.put("ajkData", company);
                     }
                 }
             }