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 c3b2cbd8..33f870bb 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/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
index a182662c..c3952b5b 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
@@ -7774,7 +7774,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
result = result.stream().filter(model -> {
boolean flag = true;
// 组织下的内容不在【架构筛选】功能的影响内
- if (!("org".equals(((JSONObject)model).getString("plCategory")))) {
+ if (!("org".equals(((JSONObject)model).getString("plCategory")) || "itsystem.normal".equals(((JSONObject)model).getString("plMethodId")))) {
if ("process.framework".equals(((JSONObject)model).getString("plMethodId")) || "default".equals(((JSONObject)model).getString("plMethodId"))){
flag = this.filterEmptyMoldel(((JSONObject)model).getString("wsId"),((JSONObject)model).getString("currId"));
}
@@ -7786,7 +7786,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
if (methodIdList.size() > 0) {
result = result.stream()
.filter(item -> {
- if ("org".equals(((JSONObject)item).getString("plCategory"))) {
+ if ("org".equals(((JSONObject)item).getString("plCategory")) || "itsystem.normal".equals(((JSONObject)item).getString("plMethodId"))) {
return true;
}
boolean flag = false;
@@ -7804,7 +7804,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
if (createUserList.size() > 0) {
result = result.stream()
.filter(item -> {
- if ("org".equals(((JSONObject)item).getString("plCategory"))) {
+ if ("org".equals(((JSONObject)item).getString("plCategory")) || "itsystem.normal".equals(((JSONObject)item).getString("plMethodId"))) {
return true;
}
boolean flag = false;
@@ -7821,7 +7821,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
.filter(item -> {
boolean flag = false;
JSONObject itemObj = (JSONObject) item;
- if ("org".equals(((JSONObject)item).getString("plCategory"))) {
+ if ("org".equals(((JSONObject)item).getString("plCategory")) || "itsystem.normal".equals(((JSONObject)item).getString("plMethodId"))) {
return true;
}
if ("process.framework".equals(itemObj.getString("plMethodId")) || "default".equals(itemObj.getString("plMethodId"))){
@@ -8962,8 +8962,8 @@ public String deleteReply(String replyid, String messageid) {
if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) {
recentList = recentList.stream().filter(model -> {
boolean flag = true;
- // 组织下的内容不在【架构筛选】影响范围之内
- if (!("org".equals(model.getMethodCategory()))) {
+ // 组织下的内容与IT系统图不在【架构筛选】影响范围之内
+ if (!("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId()))) {
if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){
flag = this.filterEmptyMoldel(model.getWsId(),model.getId());
}
@@ -8975,7 +8975,7 @@ public String deleteReply(String replyid, String messageid) {
recentList = recentList.stream()
.filter(model -> {
boolean flag = false;
- if ("org".equals(model.getMethodCategory())) {
+ if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) {
return true;
}
// 代表【架构】伊利专属需求
@@ -8992,7 +8992,7 @@ public String deleteReply(String replyid, String messageid) {
if (createUserList.size() > 0) {
recentList = recentList.stream().filter(model -> {
boolean flag = false;
- if ("org".equals(model.getMethodCategory())) {
+ if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) {
return true;
}
if (createUserList.contains(model.getCreateUser()) || createUserList.contains(model.getModifyUser())) {
@@ -9006,7 +9006,7 @@ public String deleteReply(String replyid, String messageid) {
recentList = recentList.stream()
.filter(model -> {
boolean flag = false;
- if ("org".equals(model.getMethodCategory())) {
+ if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) {
return true;
}
if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){
@@ -9098,7 +9098,7 @@ public String deleteReply(String replyid, String messageid) {
if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) {
commonList = commonList.stream().filter(model -> {
boolean flag = true;
- if (!("org".equals(model.getMethodCategory()))) {
+ if (!("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId()))) {
flag = this.filterEmptyMoldel(model.getWsId(),model.getId());
}
return flag;
@@ -9108,7 +9108,7 @@ public String deleteReply(String replyid, String messageid) {
if (methodIdList.size() > 0) {
commonList = commonList.stream()
.filter(model -> {
- if ("org".equals(model.getMethodCategory())) {
+ if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) {
return true;
}
boolean flag = false;
@@ -9125,7 +9125,7 @@ public String deleteReply(String replyid, String messageid) {
if (createUserList.size() > 0) {
commonList = commonList.stream().filter(model -> {
boolean flag = false;
- if ("org".equals(model.getMethodCategory())) {
+ if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) {
return true;
}
if (createUserList.contains(model.getCreateUser()) || createUserList.contains(model.getModifyUser())) {
@@ -9137,7 +9137,7 @@ public String deleteReply(String replyid, String messageid) {
if (orgIdList.size() > 0) {
commonList = commonList.stream()
.filter(model -> {
- if ("org".equals(model.getMethodCategory())) {
+ if ("org".equals(model.getMethodCategory()) || "itsystem.normal".equals(model.getMethodId())) {
return true;
}
boolean flag = false;
@@ -9537,7 +9537,7 @@ public String deleteReply(String replyid, String messageid) {
if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) {
tableData = tableData.stream().filter(item -> {
boolean flag = true;
- if (!("org".equals(((JSONObject)item).getString("category")))) {
+ if (!("org".equals(((JSONObject)item).getString("category")) || "itsystem.normal".equals(((JSONObject)item).getString("methodId")))) {
if ("process.framework".equals(((JSONObject)item).getString("methodId")) || "default".equals(((JSONObject)item).getString("methodId"))){
flag = this.filterEmptyMoldel(((JSONObject)item).getString("wsId"),((JSONObject)item).getString("id"));
}
@@ -9549,7 +9549,7 @@ public String deleteReply(String replyid, String messageid) {
if (methodIdList.size() > 0) {
tableData = tableData.stream()
.filter(item -> {
- if ("org".equals(((JSONObject)item).getString("category"))) {
+ if ("org".equals(((JSONObject)item).getString("category")) || "itsystem.normal".equals(((JSONObject)item).getString("methodId"))) {
return true;
}
boolean flag = false;
@@ -9567,7 +9567,7 @@ public String deleteReply(String replyid, String messageid) {
if (createUserList.size() > 0) {
tableData = tableData.stream()
.filter(item -> {
- if ("org".equals(((JSONObject)item).getString("category"))) {
+ if ("org".equals(((JSONObject)item).getString("category")) || "itsystem.normal".equals(((JSONObject)item).getString("methodId"))) {
return true;
}
boolean flag = false;
@@ -9584,7 +9584,7 @@ public String deleteReply(String replyid, String messageid) {
.filter(item -> {
boolean flag = false;
JSONObject itemObj = (JSONObject) item;
- if ("org".equals(((JSONObject)item).getString("category"))) {
+ if ("org".equals(((JSONObject)item).getString("category")) || "itsystem.normal".equals(((JSONObject)item).getString("methodId"))) {
return true;
}
if ("process.framework".equals(itemObj.getString("methodId")) || "default".equals(itemObj.getString("methodId"))){
diff --git a/com.actionsoft.apps.coe.pal/template/page/main.htm b/com.actionsoft.apps.coe.pal/template/page/main.htm
index 6c8fe332..734799a5 100644
--- a/com.actionsoft.apps.coe.pal/template/page/main.htm
+++ b/com.actionsoft.apps.coe.pal/template/page/main.htm
@@ -13,4 +13,4 @@
var mainType = "<#mainType>";
var uid = "<#uid>";
var wHref = "./w";
- var jdHref = "./jd";