1111

src/main/java/com/fdkankan/jp/xspace/service/impl/SceneXspaceServiceImpl.java

@@ -65,8 +65,8 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
     @Override
     public PageInfo pageXspace(XspacePageDTO param, User user) {
         Set<Long> roleIds = userRoleService.getByUser(user);
-        if(!roleIds.contains(5)){//平台管理员可以看到所有
-            if(roleIds.contains(6)){//公司管理员可以看到同一公司下所有
+        if(!roleIds.contains(5L)){//平台管理员可以看到所有
+            if(roleIds.contains(6L)){//公司管理员可以看到同一公司下所有
                 param.setCompanyId(user.getCompanyId());
             }else{//普通员工只能看到自己的
                 param.setUserId(user.getId());

src/main/java/com/fdkankan/jp/xspace/service/impl/UnityServiceImpl.java

@@ -124,7 +124,7 @@ public class UnityServiceImpl implements IUnityService {
         });
 
         //上传文件映射json
-        fYunFileService.uploadFile(workPath + "xxx.json", xspaceSceneOssPath + "xxx.json");
+//        fYunFileService.uploadFile(workPath + "xxx.json", xspaceSceneOssPath + "xxx.json");
 
         //复制skybox图
         String sourceImagesPath = String.format(OSSPathConstant.SCENE_VIEW_DATA_IMAGES, bean.getNum()) + "tiles/4k/";
@@ -163,7 +163,7 @@ public class UnityServiceImpl implements IUnityService {
         SceneInfoVO sceneInfoVO = null;
         //先查询redis
         if(StrUtil.isEmpty(sceneJson)) {
-            String objectName = String.format(OSSPathConstant.SCENE_VIEW_DATA, num) + "scene.json";
+            String objectName = String.format(OSSPathConstant.SCENE_VIEW_DATA_DATA, num) + "scene.json";
             sceneJson = fYunFileService.getFileContent(objectName);
         }
         sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);