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

小组应用全选相关方法调整

Browse Source
This commit is contained in:
anhc 2022-07-15 17:37:18 +08:00
parent 04ac5a7a43
commit 87b3da3227
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

27
com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/web/CooperationWeb.java
View File

@ -1159,6 +1159,7 @@ public class CooperationWeb extends ActionWeb {
ro.put("dataActionPermOpts", dataActionPermOpts);
ro.put("appPerm", appPerm);
ro.put("actionPerm", actionPerm);
ro.put("teamPermFileSize", CooperationCache.getTeamInfo(teamId).getVersionIds().size());
ro.put("dataPermText", StringUtils.join(dataPermTextList, ","));
return ro.toString();
@ -1280,14 +1281,26 @@ public class CooperationWeb extends ActionWeb {
* @return
*/
public String searchCooperationTeamRepositoryAllChildrenData(String wsId, String teamId, String pid) {
Set<String> versionIds = CooperationUtil.getPermRepositoryVersionIds(wsId, teamId, null, null);
List<PALRepositoryModel> list = new ArrayList<>();
Set<String> idSet = new HashSet<>();
PALRepositoryCache.getAllChildrenModelsByPid(wsId, pid, list, idSet);
JSONArray result = new JSONArray();
for (PALRepositoryModel model : list) {
if (versionIds.contains(model.getVersionId()) && model.isUse()) {
result.add(model.getVersionId());
Set<String> versionIds = CooperationUtil.getPermRepositoryVersionIds(wsId, teamId, null, null);
if (StringUtils.isNotEmpty(pid)){
List<PALRepositoryModel> list = new ArrayList<>();
Set<String> idSet = new HashSet<>();
PALRepositoryCache.getAllChildrenModelsByPid(wsId, pid, list, idSet);
for (PALRepositoryModel model : list) {
if (versionIds.contains(model.getVersionId()) && model.isUse()) {
result.add(model.getVersionId());
}
}
}else {
for (String versionId : versionIds) {
List<PALRepositoryModel> repositoryModels = PALRepositoryCache.getByVersionId(wsId, versionId);
for (PALRepositoryModel repositoryModel : repositoryModels) {
if (repositoryModel.isUse()){
result.add(versionId);
break;
}
}
}
}
ResponseObject ro = ResponseObject.newOkResponse();