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 21d0038a..367655a4 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/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 84ef11cd..26fd0cc9 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -1516,15 +1516,13 @@ public class PALRepositoryQueryAPIManager { } } - if(!methods.contains(model.getMethodId()) || depflag==false){ - if(!model.isPublish()){ + if(!methods.contains(model.getMethodId()) || depflag==false || !model.isPublish()){ removeList.add(model); - } } + } list.removeAll(removeList); } - return list; } @@ -1653,7 +1651,6 @@ public class PALRepositoryQueryAPIManager { } modelList = tempList; } - if (onlyPublish){ List modelList2 = new ArrayList(); for (PALRepositoryModel repositoryModel : modelList) { @@ -1672,7 +1669,6 @@ public class PALRepositoryQueryAPIManager { } modelList = modelList2; } - List newList = setNewPid(modelList); Collections.sort(newList, new Comparator1()); @@ -2256,13 +2252,16 @@ public class PALRepositoryQueryAPIManager { List modelList2 = new ArrayList(); for (PALRepositoryModel repositoryModel : list) { if ("process.framework".equals(repositoryModel.getMethodId()) || "default".equals(repositoryModel.getMethodId())){ - // 判断文件夹及所有子级下是否存在已发布模型 - List children = new ArrayList<>(); - getAllPublishedPalRepositoryModelsByPidDep(wsId, repositoryModel.getId(), children,methods,departId,tempOrgList); - if (children.size() > 0){ - modelList2.add(repositoryModel); - continue; - } + + // 判断文件夹及所有子级下是否存在已发布模型 + List children = new ArrayList<>(); + getAllPublishedPalRepositoryModelsByPidDep(wsId, repositoryModel.getId(), children,methods,departId,tempOrgList); + if (children.size() > 0){ + modelList2.add(repositoryModel); + continue; + } + + } if (repositoryModel.isPublish()){ @@ -2271,6 +2270,7 @@ public class PALRepositoryQueryAPIManager { } list = modelList2; } + Collections.sort(list, new Comparator1()); // 按级别排序 List newList = setNewPid(list); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java index dfc18893..7a9e1290 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java @@ -1625,10 +1625,10 @@ public class CoeProcessLevelUtil { if (list != null) { for (PALRepositoryModel model : list) { if ((model.isUse() && model.getMethodId().equals("process.framework"))) { - result.add(model); + result.add(model); } if ((model.isPublish() && !model.getMethodId().equals("process.framework"))) { - result.add(model); + result.add(model); } } @@ -1636,7 +1636,6 @@ public class CoeProcessLevelUtil { } - return result; }