1111

src/main/java/com/fdkankan/jp/xspace/common/constant/UnityConstant.java

@@ -2,7 +2,7 @@ package com.fdkankan.jp.xspace.common.constant;
 
 public class UnityConstant {
 
-    public final static String EXEC_UNITY_FORMAT = "/opt/unity/Editor/Unity -accept-apiupdate -batchmode -disable-gpu-skinning -nographics -silent-crashes -force-free -projectPath /opt/unity/UnityBuildPipelineProject -executeMethod FDKKSceneTiles.Editor.BuildPipeline.StartBuildPipeline -meshPath @workPath@ -serial @serial@ -username @account@ -password @pwd@ -quit -logFile @workPath@";
+    public final static String EXEC_UNITY_FORMAT = "/opt/unity/Editor/Unity -accept-apiupdate -batchmode -disable-gpu-skinning -nographics -silent-crashes -force-free -projectPath /opt/unity/UnityBuildPipelineProject -executeMethod FDKKSceneTiles.Editor.BuildPipeline.StartBuildPipeline -meshPath @workPath@ -serial @serial@ -username @account@ -password @pwd@ -quit -logFile @workPath@Editor.log";
 
 
 }

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

@@ -90,8 +90,8 @@ public class SceneXspaceServiceImpl extends ServiceImpl<ISceneXspaceMapper, Scen
         Set<Long> userIds = sceneXspaces.stream().map(x -> x.getUserId()).collect(Collectors.toSet());
         Set<Long> roleIds = userRoleService.getByUser(user);
         boolean notPermission = false;
-        if(!roleIds.contains(5)){//平台管理员可以看到所有
-            if(roleIds.contains(6)){//公司管理员可以看到同一公司下所有
+        if(!roleIds.contains(5L)){//平台管理员可以看到所有
+            if(roleIds.contains(6L)){//公司管理员可以看到同一公司下所有
                 List<User> users = userService.listByIds(userIds);
                 notPermission = users.stream().anyMatch(u -> !u.getCompanyId().equals(user.getCompanyId()));
             }else{//普通员工只能删除自己的