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 b8519301..b51d0480 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 f619efaf..a182662c 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 @@ -7773,7 +7773,8 @@ public class CoeProcessLevelWeb extends ActionWeb { if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) { result = result.stream().filter(model -> { boolean flag = true; - if (!("itsystem.normal".equals(((JSONObject)model).getString("plMethodId")) || "org.normal".equals(((JSONObject)model).getString("plMethodId")))) { + // 组织下的内容不在【架构筛选】功能的影响内 + if (!("org".equals(((JSONObject)model).getString("plCategory")))) { 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")); } @@ -7785,7 +7786,7 @@ public class CoeProcessLevelWeb extends ActionWeb { if (methodIdList.size() > 0) { result = result.stream() .filter(item -> { - if ("itsystem.normal".equals(((JSONObject)item).getString("plMethodId")) || "org.normal".equals(((JSONObject)item).getString("plMethodId"))) { + if ("org".equals(((JSONObject)item).getString("plCategory"))) { return true; } boolean flag = false; @@ -7803,7 +7804,7 @@ public class CoeProcessLevelWeb extends ActionWeb { if (createUserList.size() > 0) { result = result.stream() .filter(item -> { - if ("itsystem.normal".equals(((JSONObject)item).getString("plMethodId")) || "org.normal".equals(((JSONObject)item).getString("plMethodId"))) { + if ("org".equals(((JSONObject)item).getString("plCategory"))) { return true; } boolean flag = false; @@ -7820,7 +7821,7 @@ public class CoeProcessLevelWeb extends ActionWeb { .filter(item -> { boolean flag = false; JSONObject itemObj = (JSONObject) item; - if ("itsystem.normal".equals(itemObj.getString("plMethodId")) || "org.normal".equals(itemObj.getString("plMethodId"))) { + if ("org".equals(((JSONObject)item).getString("plCategory"))) { return true; } if ("process.framework".equals(itemObj.getString("plMethodId")) || "default".equals(itemObj.getString("plMethodId"))){ @@ -8961,7 +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 (!("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId()))) { + // 组织下的内容不在【架构筛选】影响范围之内 + if (!("org".equals(model.getMethodCategory()))) { if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){ flag = this.filterEmptyMoldel(model.getWsId(),model.getId()); } @@ -8973,7 +8975,7 @@ public String deleteReply(String replyid, String messageid) { recentList = recentList.stream() .filter(model -> { boolean flag = false; - if ("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId())) { + if ("org".equals(model.getMethodCategory())) { return true; } // 代表【架构】伊利专属需求 @@ -8990,7 +8992,7 @@ public String deleteReply(String replyid, String messageid) { if (createUserList.size() > 0) { recentList = recentList.stream().filter(model -> { boolean flag = false; - if ("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId())) { + if ("org".equals(model.getMethodCategory())) { return true; } if (createUserList.contains(model.getCreateUser()) || createUserList.contains(model.getModifyUser())) { @@ -9004,7 +9006,7 @@ public String deleteReply(String replyid, String messageid) { recentList = recentList.stream() .filter(model -> { boolean flag = false; - if ("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId())) { + if ("org".equals(model.getMethodCategory())) { return true; } if ("process.framework".equals(model.getMethodId()) || "default".equals(model.getMethodId())){ @@ -9096,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 (!("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId()))) { + if (!("org".equals(model.getMethodCategory()))) { flag = this.filterEmptyMoldel(model.getWsId(),model.getId()); } return flag; @@ -9106,7 +9108,7 @@ public String deleteReply(String replyid, String messageid) { if (methodIdList.size() > 0) { commonList = commonList.stream() .filter(model -> { - if ("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId())) { + if ("org".equals(model.getMethodCategory())) { return true; } boolean flag = false; @@ -9123,7 +9125,7 @@ public String deleteReply(String replyid, String messageid) { if (createUserList.size() > 0) { commonList = commonList.stream().filter(model -> { boolean flag = false; - if ("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId())) { + if ("org".equals(model.getMethodCategory())) { return true; } if (createUserList.contains(model.getCreateUser()) || createUserList.contains(model.getModifyUser())) { @@ -9135,7 +9137,7 @@ public String deleteReply(String replyid, String messageid) { if (orgIdList.size() > 0) { commonList = commonList.stream() .filter(model -> { - if ("itsystem.normal".equals(model.getMethodId()) || "org.normal".equals(model.getMethodId())) { + if ("org".equals(model.getMethodCategory())) { return true; } boolean flag = false; @@ -9452,6 +9454,7 @@ public String deleteReply(String replyid, String messageid) { subObj.put("wsId", subModel.getWsId()); subObj.put("versionId", subModel.getVersionId()); subObj.put("name", subModel.getName()); + subObj.put("category", subModel.getMethodCategory()); subObj.put("methodId", subModel.getMethodId()); subObj.put("methodName", I18nRes.findValue(CoEConstant.APP_ID, subModel.getMethodId())); PALMethodModel methodModel = PALMethodCache.getPALMethodModelById(subModel.getMethodId()); @@ -9534,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 (!("itsystem.normal".equals(((JSONObject)item).getString("methodId")) || "org.normal".equals(((JSONObject)item).getString("methodId")))) { + if (!("org".equals(((JSONObject)item).getString("category")))) { 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")); } @@ -9546,7 +9549,7 @@ public String deleteReply(String replyid, String messageid) { if (methodIdList.size() > 0) { tableData = tableData.stream() .filter(item -> { - if ("itsystem.normal".equals(((JSONObject)item).getString("methodId")) || "org.normal".equals(((JSONObject)item).getString("methodId"))) { + if ("org".equals(((JSONObject)item).getString("category"))) { return true; } boolean flag = false; @@ -9564,7 +9567,7 @@ public String deleteReply(String replyid, String messageid) { if (createUserList.size() > 0) { tableData = tableData.stream() .filter(item -> { - if ("itsystem.normal".equals(((JSONObject)item).getString("methodId")) || "org.normal".equals(((JSONObject)item).getString("methodId"))) { + if ("org".equals(((JSONObject)item).getString("category"))) { return true; } boolean flag = false; @@ -9581,7 +9584,7 @@ public String deleteReply(String replyid, String messageid) { .filter(item -> { boolean flag = false; JSONObject itemObj = (JSONObject) item; - if ("itsystem.normal".equals(itemObj.getString("methodId")) || "org.normal".equals(itemObj.getString("methodId"))) { + if ("org".equals(((JSONObject)item).getString("category"))) { return true; } if ("process.framework".equals(itemObj.getString("methodId")) || "default".equals(itemObj.getString("methodId"))){