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

我的申请模糊查询bug？

This commit is contained in:
wangliwen 2022-05-26 18:43:00 +08:00
parent 6d11d96360
commit 7429fb7a31
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,8 @@ public class ActHistoryService {
params.put("startBy", SecurityUser.getUserId().toString()); params.put("startBy", SecurityUser.getUserId().toString());
PageData<ProcessInstanceDTO> pageData = this.getHistoryProcessInstancePage(params); PageData<ProcessInstanceDTO> pageData = this.getHistoryProcessInstancePage(params);
if (params.containsKey("name") && StringUtils.isNotBlank(params.get("name").toString())) { if (params.containsKey("name") && StringUtils.isNotBlank(params.get("name").toString())) {
params.put("limit", String.valueOf(pageData.getTotal())); // TODO 为啥这么处理？
// params.put("limit", String.valueOf(pageData.getTotal()));
pageData = this.getHistoryProcessInstancePage(params); pageData = this.getHistoryProcessInstancePage(params);
} }
List<ProcessInstanceDTO> list = pageData.getList(); List<ProcessInstanceDTO> list = pageData.getList();

4
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -477,7 +477,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<Map<String, Object>> typeCountListByDept = resourceDao.selectDeptTypeCountList(); List<Map<String, Object>> typeCountListByDept = resourceDao.selectDeptTypeCountList();
Map<String, List<Map<String, Object>>> typeCountListMap = typeCountListByDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString())); Map<String, List<Map<String, Object>>> typeCountListMap = typeCountListByDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString()));
ArrayList<Map> resultList = new ArrayList<>(); ArrayList<Map> resultList = new ArrayList<>();
typeCountListMap.forEach((k,v) -> { typeCountListMap.forEach((k, v) -> {
HashMap<Object, Object> map = new HashMap<>(); HashMap<Object, Object> map = new HashMap<>();
map.put("name", k); map.put("name", k);
v.forEach(item -> { v.forEach(item -> {
@ -493,7 +493,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List<Map<String, Object>> typeCountListByApplyDept = resourceDao.selectApplyDeptTypeCountList(); List<Map<String, Object>> typeCountListByApplyDept = resourceDao.selectApplyDeptTypeCountList();
Map<String, List<Map<String, Object>>> typeCountListMap = typeCountListByApplyDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString())); Map<String, List<Map<String, Object>>> typeCountListMap = typeCountListByApplyDept.stream().collect(Collectors.groupingBy(m -> m.get("deptName").toString()));
ArrayList<Map> resultList = new ArrayList<>(); ArrayList<Map> resultList = new ArrayList<>();
typeCountListMap.forEach((k,v) -> { typeCountListMap.forEach((k, v) -> {
HashMap<Object, Object> map = new HashMap<>(); HashMap<Object, Object> map = new HashMap<>();
map.put("name", k); map.put("name", k);
v.forEach(item -> { v.forEach(item -> {