wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

屮

This commit is contained in:
wangliwen 2022-05-26 19:38:54 +08:00
parent 7ba6af7f05
commit 1b67c7865a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -210,9 +210,6 @@ public class ActHistoryService {
query.startedBy((String) params.get("startBy"));
}
query.orderByProcessInstanceStartTime().desc();
// if (params.containsKey("name")) {
// query = query.variableValueLike("name", params.get("name").toString());
// }
List<HistoricProcessInstance> list = query.listPage((curPage - 1) * limit, limit);
List<ProcessInstanceDTO> listInstance = new ArrayList<>();
if (!list.isEmpty()) {
@ -255,8 +252,10 @@ public class ActHistoryService {
params.put("startBy", SecurityUser.getUserId().toString());
PageData<ProcessInstanceDTO> pageData = this.getHistoryProcessInstancePage(params);
String limit = params.get("limit").toString();
String page = params.get("page").toString();
if (params.containsKey("name") && StringUtils.isNotBlank(params.get("name").toString())) {
params.put("limit", String.valueOf(pageData.getTotal()));
params.put("page", "1");
pageData = this.getHistoryProcessInstancePage(params);
}
List<ProcessInstanceDTO> list = pageData.getList();
@ -323,8 +322,8 @@ public class ActHistoryService {
.filter(index -> null != index.getName() && index.getName().contains(params.get("name").toString()))
.forEach(list1::add);
ArrayList<ProcessInstanceDTO> list2 = new ArrayList<>();
int j = Math.min(Integer.parseInt(params.get("page").toString()) * Integer.parseInt(limit), list1.size());
for (int i = (Integer.parseInt(params.get("page").toString()) - 1) * Integer.parseInt(limit); i < j; i++) {
int j = Math.min(Integer.parseInt(page) * Integer.parseInt(limit), list1.size());
for (int i = (Integer.parseInt(page) - 1) * Integer.parseInt(limit); i < j; i++) {
list2.add(list1.get(i));
}
pageData.setTotal(list1.size());