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

解决停用版本问题

Browse Source
This commit is contained in:
zhal 2022-10-31 10:56:01 +08:00
parent 8f751bbc9d
commit ce20a019b1
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar
View File

Binary file not shown.

32
com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java
View File

@ -4,15 +4,7 @@ import java.io.File;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
@ -2410,7 +2402,14 @@ public class ProcessPublishWeb extends ActionWeb {
if (team != null) if (team != null)
wsId = team.getWsId(); wsId = team.getWsId();
} }
List<PALRepositoryModel> list = dao.getPublishedRepositoryList(wsId); List<PALRepositoryModel> orglist = dao.getPublishedRepositoryList(wsId);
//根据名称去重
List<PALRepositoryModel> list = orglist.stream().collect(Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(PALRepositoryModel::getName))), ArrayList::new));
// List<String> versionIds = CoeCooperationAPIManager.getInstance().queryCooperationRoleDataPermByTeamUser(teamId, _uc.getUID()); // List<String> versionIds = CoeCooperationAPIManager.getInstance().queryCooperationRoleDataPermByTeamUser(teamId, _uc.getUID());
Set<String> versionIds = CooperationCache.getUserDataVisitablePermission(teamId, _uc.getUID(), false); Set<String> versionIds = CooperationCache.getUserDataVisitablePermission(teamId, _uc.getUID(), false);
if (UtilString.isNotEmpty(teamId)) if (UtilString.isNotEmpty(teamId))
@ -2421,12 +2420,21 @@ public class ProcessPublishWeb extends ActionWeb {
removeList.add(model); removeList.add(model);
list.removeAll(removeList); list.removeAll(removeList);
} }
// 只获取有未发布版本的已发布流程文件 // 只获取有未发布版本的已发布流程文件
List<PALRepositoryModel> list2 = new ArrayList<>(); List<PALRepositoryModel> list2 = new ArrayList<>();
for (PALRepositoryModel model : list) { for (PALRepositoryModel model : list) {
List<PALRepositoryModel> temp = PALRepositoryCache.getByVersionId(model.getWsId(), model.getVersionId()); List<PALRepositoryModel> temp = PALRepositoryCache.getByVersionId(model.getWsId(), model.getVersionId());
if (temp != null && temp.size() > 1) if (temp != null && temp.size() > 1) {
list2.add(model); //判断历史版本是否存在未发布，如果有则添加
if(temp.stream()
.filter(item->item.isPublish()
==false)
.findAny()
.isPresent()) {
list2.add(model);
}
}
} }
JSONArray treeData = getRepositoryTree(list2, wsId, false, true, "-", false); JSONArray treeData = getRepositoryTree(list2, wsId, false, true, "-", false);
return treeData; return treeData;