yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据属性 角色模型跳转 多版本下 小组用户权限问题

Browse Source
This commit is contained in:
qinoy 2023-04-12 10:41:28 +08:00
parent 4b8f7c67ca
commit 49c26905a9
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java
View File

@ -1541,7 +1541,7 @@ public class PALRepositoryQueryAPIManager {
if (versionIds.size() > 0){ if (versionIds.size() > 0){
List<PALRepositoryModel> modelList = new ArrayList<>(); List<PALRepositoryModel> modelList = new ArrayList<>();
for (PALRepositoryModel model : list) { for (PALRepositoryModel model : list) {
if (versionIds.contains(model.getId())){ if (versionIds.contains(model.getVersionId())){
modelList.add(model); modelList.add(model);
} }
} }

13
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
View File

@ -4226,12 +4226,17 @@ public class CoeDesignerWeb extends ActionWeb {
} }
// 新版本文件 小组权限设置
if (UtilString.isNotEmpty(teamId)){
CoeCooperationAPIManager.getInstance().addRepositoryToTeamAndRolePerm(_uc,teamId,lastplModel.getVersionId(),true,true);
}
//1.创建角色模型 //1.创建角色模型
DesignerShapeRelationDao dao = new DesignerShapeRelationDao(); DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
List<DesignerShapeRelationModel> oldModelList = dao.getModelListByFileId(oldUUID); List<DesignerShapeRelationModel> oldModelList = dao.getModelListByFileId(oldUUID);
if (oldModelList.size()>0 && oldModelList.get(0).getAttrId().equals("role")) { 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 isLargeIteration
* @param olduuid * @param olduuid
*/ */
public String CreateRelevanceRoleModel(boolean isLargeIteration,String olduuid,PALRepositoryModel newModel,Map<String, String> mapNewUUID,Double tempVer){ public String CreateRelevanceRoleModel(boolean isLargeIteration,String olduuid,PALRepositoryModel newModel,Map<String, String> mapNewUUID,Double tempVer,String teamId){
ResponseObject ro = null; ResponseObject ro = null;
DesignerShapeRelationDao dao = new DesignerShapeRelationDao(); DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
List<DesignerShapeRelationModel> oldModelList = dao.getModelListByFileId(olduuid); List<DesignerShapeRelationModel> 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); CoeProcessLevelUtil.copyRepositoryProperty(PALRepositoryCache.getCache().get(relationFileId), PALRepositoryCache.getCache().get(newUUID), mapNewUUID1, _uc);
ro = ResponseObject.newOkResponse("创建成功"); ro = ResponseObject.newOkResponse("创建成功");