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-06 15:28:06 +08:00
parent 7d7f33c6b8
commit 01ed4ba72d
3 changed files with 8 additions and 5 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.

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

@ -2228,7 +2228,7 @@ public class PALRepositoryQueryAPIManager {
List<PALRepositoryModel> list = null;
boolean isUsed = true;
boolean isPublished = true;
list = getPalRepositoryModelsByTeamIdByDeptId(wsId, context.getUID(), teamId, isUsed);
list = getPalRepositoryModelsByTeamIdByDeptId(wsId, context.getUID(), teamId);
if (list == null) {
list = new ArrayList<PALRepositoryModel>();
}
@ -2317,8 +2317,8 @@ public class PALRepositoryQueryAPIManager {
return result;
}
public List<PALRepositoryModel> getPalRepositoryModelsByTeamIdByDeptId(String wsId, String userId, String teamId, boolean isUsed) {
List<PALRepositoryModel> list = CoeProcessLevelUtil.getPermRepositoryListByDeptId(wsId, teamId, userId, null, null, isUsed);
public List<PALRepositoryModel> getPalRepositoryModelsByTeamIdByDeptId(String wsId, String userId, String teamId) {
List<PALRepositoryModel> list = CoeProcessLevelUtil.getPermRepositoryListByDeptId(wsId, teamId, userId, null, null);
return list;
}

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

@ -1617,14 +1617,17 @@ public class CoeProcessLevelUtil {
}
public static List<PALRepositoryModel> getPermRepositoryListByDeptId(String wsId, String teamId, String userId, String category, String method, boolean isUse) {
public static List<PALRepositoryModel> getPermRepositoryListByDeptId(String wsId, String teamId, String userId, String category, String method) {
List<PALRepositoryModel> result = new ArrayList<>();
Set<String> versionIds = getPermRepositoryVersionIds(wsId, teamId, userId, category, method);
for (String versionId : versionIds) {
List<PALRepositoryModel> list = PALRepositoryCache.getByVersionId(versionId);
if (list != null) {
for (PALRepositoryModel model : list) {
if ((isUse && model.isUse())) {
if ((model.isUse() && model.getMethodId().equals("process.framework"))) {
result.add(model);
}
if ((model.isPublish() && !model.getMethodId().equals("process.framework"))) {
result.add(model);
}