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

报告生成器查询架构文件夹代码优化

Browse Source
This commit is contained in:
zhaol 2025-05-07 16:15:34 +08:00
parent f00ddaaf5d
commit ad90c06acb
3 changed files with 15 additions and 16 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.

26
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java
View File

@ -1516,15 +1516,13 @@ public class PALRepositoryQueryAPIManager {
} }
} }
if(!methods.contains(model.getMethodId()) || depflag==false){ if(!methods.contains(model.getMethodId()) || depflag==false || !model.isPublish()){
if(!model.isPublish()){
removeList.add(model); removeList.add(model);
}
} }
} }
list.removeAll(removeList); list.removeAll(removeList);
} }
return list; return list;
} }
@ -1653,7 +1651,6 @@ public class PALRepositoryQueryAPIManager {
} }
modelList = tempList; modelList = tempList;
} }
if (onlyPublish){ if (onlyPublish){
List<PALRepositoryModel> modelList2 = new ArrayList<PALRepositoryModel>(); List<PALRepositoryModel> modelList2 = new ArrayList<PALRepositoryModel>();
for (PALRepositoryModel repositoryModel : modelList) { for (PALRepositoryModel repositoryModel : modelList) {
@ -1672,7 +1669,6 @@ public class PALRepositoryQueryAPIManager {
} }
modelList = modelList2; modelList = modelList2;
} }
List<PALRepositoryModel> newList = setNewPid(modelList); List<PALRepositoryModel> newList = setNewPid(modelList);
Collections.sort(newList, new Comparator1()); Collections.sort(newList, new Comparator1());
@ -2256,13 +2252,16 @@ public class PALRepositoryQueryAPIManager {
List<PALRepositoryModel> modelList2 = new ArrayList<PALRepositoryModel>(); List<PALRepositoryModel> modelList2 = new ArrayList<PALRepositoryModel>();
for (PALRepositoryModel repositoryModel : list) { for (PALRepositoryModel repositoryModel : list) {
if ("process.framework".equals(repositoryModel.getMethodId()) || "default".equals(repositoryModel.getMethodId())){ if ("process.framework".equals(repositoryModel.getMethodId()) || "default".equals(repositoryModel.getMethodId())){
// 判断文件夹及所有子级下是否存在已发布模型
List<PALRepositoryModel> children = new ArrayList<>(); // 判断文件夹及所有子级下是否存在已发布模型
getAllPublishedPalRepositoryModelsByPidDep(wsId, repositoryModel.getId(), children,methods,departId,tempOrgList); List<PALRepositoryModel> children = new ArrayList<>();
if (children.size() > 0){ getAllPublishedPalRepositoryModelsByPidDep(wsId, repositoryModel.getId(), children,methods,departId,tempOrgList);
modelList2.add(repositoryModel); if (children.size() > 0){
continue; modelList2.add(repositoryModel);
} continue;
}
} }
if (repositoryModel.isPublish()){ if (repositoryModel.isPublish()){
@ -2271,6 +2270,7 @@ public class PALRepositoryQueryAPIManager {
} }
list = modelList2; list = modelList2;
} }
Collections.sort(list, new Comparator1()); // 按级别排序 Collections.sort(list, new Comparator1()); // 按级别排序
List<PALRepositoryModel> newList = setNewPid(list); List<PALRepositoryModel> newList = setNewPid(list);

5
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
View File

@ -1625,10 +1625,10 @@ public class CoeProcessLevelUtil {
if (list != null) { if (list != null) {
for (PALRepositoryModel model : list) { for (PALRepositoryModel model : list) {
if ((model.isUse() && model.getMethodId().equals("process.framework"))) { if ((model.isUse() && model.getMethodId().equals("process.framework"))) {
result.add(model); result.add(model);
} }
if ((model.isPublish() && !model.getMethodId().equals("process.framework"))) { if ((model.isPublish() && !model.getMethodId().equals("process.framework"))) {
result.add(model); result.add(model);
} }
} }
@ -1636,7 +1636,6 @@ public class CoeProcessLevelUtil {
} }
return result; return result;
} }