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 69423c28..0499f48d 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/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 42c68aea..33337b77 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -1541,7 +1541,7 @@ public class PALRepositoryQueryAPIManager { if (versionIds.size() > 0){ List modelList = new ArrayList<>(); for (PALRepositoryModel model : list) { - if (versionIds.contains(model.getId())){ + if (versionIds.contains(model.getVersionId())){ modelList.add(model); } } 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 d4b9c49b..a448564e 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 @@ -4226,12 +4226,17 @@ public class CoeDesignerWeb extends ActionWeb { } + // 新版本文件 小组权限设置 + if (UtilString.isNotEmpty(teamId)){ + CoeCooperationAPIManager.getInstance().addRepositoryToTeamAndRolePerm(_uc,teamId,lastplModel.getVersionId(),true,true); + } + //1.创建角色模型 DesignerShapeRelationDao dao = new DesignerShapeRelationDao(); List oldModelList = dao.getModelListByFileId(oldUUID); if (oldModelList.size()>0 && oldModelList.get(0).getAttrId().equals("role")) { - CreateRelevanceRoleModel(isLargeIteration,oldUUID,PALRepositoryCache.getCache().get(newUUID),mapNewUUID,tempVer); + CreateRelevanceRoleModel(isLargeIteration,oldUUID,PALRepositoryCache.getCache().get(newUUID),mapNewUUID,tempVer,teamId); } //创建绩效关联关系 @@ -4261,7 +4266,7 @@ public class CoeDesignerWeb extends ActionWeb { * @param isLargeIteration * @param olduuid */ - public String CreateRelevanceRoleModel(boolean isLargeIteration,String olduuid,PALRepositoryModel newModel,Map mapNewUUID,Double tempVer){ + public String CreateRelevanceRoleModel(boolean isLargeIteration,String olduuid,PALRepositoryModel newModel,Map mapNewUUID,Double tempVer,String teamId){ ResponseObject ro = null; DesignerShapeRelationDao dao = new DesignerShapeRelationDao(); List oldModelList = dao.getModelListByFileId(olduuid); @@ -4335,6 +4340,10 @@ public class CoeDesignerWeb extends ActionWeb { } } + // 新版本文件 小组权限设置 + if (UtilString.isNotEmpty(teamId)){ + CoeCooperationAPIManager.getInstance().addRepositoryToTeamAndRolePerm(_uc,teamId,lastplModel.getVersionId(),true,true); + } CoeProcessLevelUtil.copyRepositoryProperty(PALRepositoryCache.getCache().get(relationFileId), PALRepositoryCache.getCache().get(newUUID), mapNewUUID1, _uc); ro = ResponseObject.newOkResponse("创建成功");