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 f6b0edc0..f32d9566 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/output/OutPutReportWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java index bc4ece01..fcd156d3 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java @@ -45,12 +45,14 @@ import com.actionsoft.sdk.local.api.ORGAPI; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Sets; +import org.apache.commons.collections.CollectionUtils; import java.io.File; import java.math.BigDecimal; import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 报告生成器web类 @@ -432,6 +434,20 @@ public class OutPutReportWeb extends ActionWeb { } else { jsonArr = PALRepositoryQueryAPIManager.getInstance().getPermPalRepositoryTreeDataByMethods(_uc, wsid, teamId, versionType, methodType); } + // 过滤掉已经停用的 + if (CollectionUtils.isNotEmpty(jsonArr)) { + JSONArray filteredJsonArr = new JSONArray(); + for (Object obj : jsonArr) { + if (obj instanceof JSONObject) { + JSONObject jsonObject = (JSONObject) obj; + if (jsonObject != null && !jsonObject.getBooleanValue("isStop")) { + filteredJsonArr.add(jsonObject); + } + } + } + jsonArr = filteredJsonArr; + } + return jsonArr.toString(); }