场景

sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -130,7 +130,7 @@ public class SceneController {
     public AjaxMessage<Integer> editScene(@ApiParam(value = "场景", required = true) @RequestBody SceneEntity scene) {
 
         //SceneEntity cScene = sceneService.findSceneById(scene.getId());
-        if(scene.getParentSceneId().equals(scene.getId()))
+        if(scene.getParentSceneId()!=null&&scene.getParentSceneId().equals(scene.getId()))
         {
             return new AjaxMessage<>(ResultStatus.SCENE_PARENT_ALREADY_EXISTS);
         }