1

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

@@ -125,19 +125,23 @@ public class AppSceneService {
                 //相机的userId为空，表示相机的场景
                 if (cameraDetail.getUserId() == null || param.getUserId() == null) {
                     record.setSceneSourceType(0);
-                } else if (cameraDetail.getUserId().longValue() == param.getUserId().longValue()) {
+                    continue;
+                }
+                if (cameraDetail.getUserId().equals(param.getUserId())) {
                     //相机用户id等于该用户id，既为用户的场景
                     record.setSceneSourceType(1);
-                } else if (camera.getId() != null && cameraDetail.getCameraId().longValue() == camera.getId().longValue()) {
+                    continue;
+                }
+                if (cameraDetail.getCameraId().equals(param.getCameraId())) {
                     if (cameraDetail.getCooperationUser() == null) {
                         //场景相机id等于该相机id
                         record.setSceneSourceType(0);
-                    } else if (cameraDetail.getCooperationUser().longValue() == param.getUserId().longValue()) {
+                    } else if (cameraDetail.getCooperationUser().equals(param.getUserId())) {
                         record.setSceneSourceType(2);
                     }
-                } else {
-                    record.setSceneSourceType(0);
+                    continue;
                 }
+                record.setSceneSourceType(0);
             }
 
         }