Merge branch 'feature-v4.12.0-dsx' into test

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -227,6 +227,9 @@ public class SceneEditServiceImpl implements ISceneEditService {
         }
 
         //权限控制完后判断若是协作账号，获取协作权限
+        if(scenePlus.getUserId().equals(ssoUser.getId())){
+            return sceneAuthVO;
+        }
         SceneCooperation sceneCooperation = sceneCooperationService.getByNum(num);
         if(Objects.nonNull(sceneCooperation)){
             List<SceneResource> sceneResourceList = sceneResourceService.findByCooperationId(sceneCooperation.getId());