Merge remote-tracking branch 'origin/task-lyh-sg' into test

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

@@ -1104,7 +1104,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             return;
         }
 
-        if(sceneProEntity.getSceneSource() != 4 || sceneProEntity.getSceneSource() != 5){
+        if(sceneProEntity.getSceneSource() != 4 && sceneProEntity.getSceneSource() != 5){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3003, "只能操作激光场景");
         }
 
@@ -1155,7 +1155,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(SceneConstant.FAILURE_CODE_5005, SceneConstant.FAILURE_MSG_5005);
         }
 
-        if(scenePlus.getSceneSource() != 4 || scenePlus.getSceneSource() !=5){
+        if(scenePlus.getSceneSource() != 4 && scenePlus.getSceneSource() !=5){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3003, "只能操作激光场景");
         }