diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 27e139a0..3a1f400d 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java index 4ffd5215..9f8c1da0 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java @@ -264,7 +264,7 @@ public class CoeDesignerWeb extends ActionWeb { Set fileActionPerm = CooperationCache.getUserDataOperatePermission(teamId, _uc.getUID(), plModel.getVersionId()); perms = UtilString.join(fileActionPerm,","); //没有文件新建、修改权限则只读 - if (fileActionPerm.contains(CoeCooperationConst.ACTION_WRITE)){ + if (!fileActionPerm.contains(CoeCooperationConst.ACTION_WRITE)){ isView = true; } Set userAPPPermission = CooperationCache.getUserAPPPermission(teamId, _uc.getUID()); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 6454a0a2..206b1f41 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -13,6 +13,7 @@ import com.actionsoft.apps.coe.pal.datamigration.util.LogUtil; import com.actionsoft.apps.coe.pal.log.CoEOpLogAPI; import com.actionsoft.apps.coe.pal.log.CoEOpLogConst; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; +import com.actionsoft.apps.coe.pal.pal.repository.designer.web.CoeDesignerWeb; import com.actionsoft.apps.coe.pal.pal.repository.util.DiagramsUtil; import com.actionsoft.apps.coe.pal.pal.repository.util.ShapeUtils; import com.actionsoft.apps.coe.pal.pal.ws.constant.CoeWsConstant; @@ -8005,6 +8006,11 @@ public class CoeProcessLevelWeb extends ActionWeb { // 小组权限设置 if (!UtilString.isEmpty(teamId)) { CoeCooperationAPIManager.getInstance().addRepositoryToTeamAndRolePerm(_uc, teamId, model.getVersionId(), true, true); + //新版权限自动lock文件 + boolean isOlderVersion = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true); + if (!isOlderVersion){ + new CoeDesignerWeb(_uc).lockOrUnlockProcess(id,"lockpro"); + } } ro.put("id", id); // 操作行为日志记录 @@ -8128,6 +8134,11 @@ public class CoeProcessLevelWeb extends ActionWeb { // 小组权限设置 if (!UtilString.isEmpty(teamId)) { CoeCooperationAPIManager.getInstance().addRepositoryToTeamAndRolePerm(_uc, teamId, model.getVersionId(), true, true); + //新版权限自动lock文件 + boolean isOlderVersion = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal", "IsOlderVersion", true); + if (!isOlderVersion){ + new CoeDesignerWeb(_uc).lockOrUnlockProcess(id,"lockpro"); + } } ro.put("id", id); // 操作行为日志记录