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

发布部门由直接作为条件查询调整为发布部门及所有子部门作为条件查询

Browse Source
This commit is contained in:
446052889@qq.com 2023-03-28 09:29:46 +08:00
parent 22dcfe7a0e
commit 80eb0ea8cd
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

26
com.actionsoft.apps.coe.pal.processlist/src/com/actionsoft/apps/coe/pal/processlist/web/PALRepositoryListWeb.java
View File

@ -30,6 +30,7 @@ import com.actionsoft.apps.coe.pal.processlist.cache.ProcessListConfigCache;
import com.actionsoft.apps.coe.pal.processlist.model.ProcessListConfigModel; import com.actionsoft.apps.coe.pal.processlist.model.ProcessListConfigModel;
import com.actionsoft.apps.coe.pal.processlist.util.ProcessListUtil; import com.actionsoft.apps.coe.pal.processlist.util.ProcessListUtil;
import com.actionsoft.apps.coe.pal.util.SubUtil; import com.actionsoft.apps.coe.pal.util.SubUtil;
import com.actionsoft.bpms.org.model.DepartmentModel;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -556,6 +557,21 @@ public class PALRepositoryListWeb extends ActionWeb {
return ro.toString(); return ro.toString();
} }
/**
* 获取所有子部门
* @param deptId
* @param result
*/
private void getAllSubDepartments(String deptId, List<DepartmentModel> result) {
List<DepartmentModel> subModels = SDK.getORGAPI().getSubDepartments(deptId);
if (subModels != null && subModels.size() > 0) {
for (DepartmentModel model : subModels) {
result.add(model);
getAllSubDepartments(model.getId(), result);
}
}
}
/** /**
* 获取符合条件的pal流程集合 * 获取符合条件的pal流程集合
* @param wsId * @param wsId
@ -598,7 +614,15 @@ public class PALRepositoryListWeb extends ActionWeb {
l3Set.add(handleCustomFilterName(frameworkSearchInput3Arr.getJSONObject(i).getString("name"))); l3Set.add(handleCustomFilterName(frameworkSearchInput3Arr.getJSONObject(i).getString("name")));
} }
for (int i = 0; i < issuingDepartmentArr.size(); i++) { for (int i = 0; i < issuingDepartmentArr.size(); i++) {
deptSet.add(issuingDepartmentArr.getJSONObject(i).getString("id")); String deptId = issuingDepartmentArr.getJSONObject(i).getString("id");
deptSet.add(deptId);
// 添加所有子部门
List<DepartmentModel> list = new ArrayList<>();
getAllSubDepartments(deptId, list);
for (DepartmentModel model : list) {
deptSet.add(model.getId());
}
} }
List<PALRepositoryModel> palList = new ArrayList<>(); List<PALRepositoryModel> palList = new ArrayList<>();