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

伊利项目 架构筛选功能遗漏的修改

Browse Source
This commit is contained in:
qinoy 2022-11-05 16:16:28 +08:00
parent b6e7902e76
commit 60b612b751
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -9656,7 +9656,7 @@ public String deleteReply(String replyid, String messageid) {
commonList = commonList.stream().filter(model -> {
boolean flag = true;
if (!("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId()))) {
flag = this.filterEmptyMoldel(model.getWsId(),model.getId());
flag = this.filterEmptyMoldel(model.getWsId(),model.getVersionId());
}
return flag;
}).collect(Collectors.toList());
@ -9672,7 +9672,7 @@ public String deleteReply(String replyid, String messageid) {
// 代表【架构】伊利专属需求
if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){
// 递归判断当前架构下是否有符合的文件类型
flag = this.filterChildLevelModelByPid(model.getWsId(), model.getId(),methodIdList);
flag = this.filterChildLevelModelByPid(model.getWsId(), model.getVersionId(),methodIdList);
}else {
flag = methodIdList.contains(model.getMethodId());
}
@ -9687,7 +9687,7 @@ public String deleteReply(String replyid, String messageid) {
}
if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){
// 递归判断当前架构下是否有符合的文件类型
flag = this.filterIsMatchRepositoryByCreateUser(model.getWsId(), model.getId(),createUserList);
flag = this.filterIsMatchRepositoryByCreateUser(model.getWsId(), model.getVersionId(),createUserList);
}else {
flag = createUserList.contains(model.getCreateUser()) || createUserList.contains(model.getModifyUser());
}
@ -9702,7 +9702,7 @@ public String deleteReply(String replyid, String messageid) {
}
boolean flag = false;
if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){
flag = this.filterIsMatchPropertyModel(model.getWsId(),model.getId(),tempOrgList);
flag = this.filterIsMatchPropertyModel(model.getWsId(),model.getVersionId(),tempOrgList);
}else {
List<DesignerShapeRelationModel> relationModels = DesignerShapeRelationCache.getByFileId(model.getId(), "Issuing_department");
// 是否有发布部门的文件属性【可能会有多个值】