1

src/main/java/com/fdkankan/ucenter/service/impl/AppSceneService.java

@@ -107,13 +107,13 @@ public class AppSceneService {
             if(record.getCameraId() == null){
                 record.setSceneSourceType(record.getUserId().longValue() == param.getUserId() ? 1 : 2);
             }else {
-                record.setSceneSourceType(record.getUserId().longValue() == param.getUserId() ? 1 : 2);
+                record.setSceneSourceType(0);
                 Camera camera = cameraHashMap.get(record.getCameraId());
-                if(ObjectUtils.isEmpty(camera)){
+                if(camera == null){
                     continue;
                 }
                 CameraDetail cameraDetail = detailHashMap.get(camera.getId());
-                if(ObjectUtils.isEmpty(cameraDetail)){
+                if(cameraDetail == null){
                     continue;
                 }
                 record.setChildName(camera.getChildName());
@@ -139,9 +139,7 @@ public class AppSceneService {
                     } else if (cameraDetail.getCooperationUser().equals(param.getUserId())) {
                         record.setSceneSourceType(2);
                     }
-                    continue;
                 }
-                record.setSceneSourceType(0);
             }
 
         }