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-07-15 14:20:28 +08:00
parent 71792fb2b0
commit 3bba0108b5
2 changed files with 6 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.

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

@ -7785,7 +7785,8 @@ public class CoeProcessLevelWeb extends ActionWeb {
}
return flag;
})
.filter(item -> methodIdList.contains(((JSONObject)item).getString("plMethodId")) || "default".equals(((JSONObject)item).getString("plMethodId")))
.filter(item -> methodIdList.contains(((JSONObject)item).getString("plMethodId"))
|| "default".equals(((JSONObject)item).getString("plMethodId")) || "process.framework".equals(((JSONObject)item).getString("plMethodId")))
.collect(Collectors.toCollection(JSONArray::new));
}
// 根据创建人过滤
@ -8918,7 +8919,8 @@ public String deleteReply(String replyid, String messageid) {
List<PALRepositoryModel> recentList = CoeProcessLevelUtil.getRecentUpdateRepositoryList(wsId, teamId, _uc.getUID(), null, null, 30);
// 伊利需求--【所选用户创建（作为“创建人”）的流程】与【当前用户所拥有流程权限】的交集
if (methodIdList.size() > 0) {
recentList = recentList.stream().filter(model -> methodIdList.contains(model.getMethodId())).collect(Collectors.toList());
recentList = recentList.stream()
.filter(model -> methodIdList.contains(model.getMethodId()) || "process.framework".equals(model.getMethodId())).collect(Collectors.toList());
}
if (createUserList.size() > 0) {
recentList = recentList.stream().filter(model -> createUserList.contains(model.getCreateUser())).collect(Collectors.toList());
@ -9306,7 +9308,8 @@ public String deleteReply(String replyid, String messageid) {
}
return flag;
})
.filter(item -> methodIdList.contains(((JSONObject)item).getString("methodId")) || "default".equals(((JSONObject)item).getString("methodId")))
.filter(item -> methodIdList.contains(((JSONObject)item).getString("methodId"))
|| "default".equals(((JSONObject)item).getString("methodId")) || "process.framework".equals(((JSONObject)item).getString("methodId")))
.collect(Collectors.toCollection(JSONArray::new));
}
// 根据创建人过滤