1

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

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