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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-11 19:48:14 +08:00
parent 1634cb4aad bc4a0f6635
commit 8cb99adfc4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -248,17 +248,6 @@ public class TAbilityApplicationController {
.map(tAbilityApplicationDTO -> resourceService.get(Long.valueOf(tAbilityApplicationDTO.getResourceId()))).collect(Collectors.toList());
List<HistoryDetailDTO> taskHandleDetailInfo = activitiService.getTaskHandleDetailInfo(tAbilityApplicationDTOList.get(0).getInstanceId());
taskHandleDetailInfo = taskHandleDetailInfo.stream().map(index_ -> { // 补充审核人部门名称
if (StringUtils.isNumeric(index_.getAssignee())) {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(index_.getAssignee()));
Optional<SysDeptDTO> sysDeptDTOOptional = Optional.ofNullable(sysDeptService.get(userDTO.getDeptId()));
if (sysDeptDTOOptional.isPresent()) {
index_.setAssigneeDeptName(sysDeptDTOOptional.get().getName());
}
}
return index_;
}).collect(Collectors.toList());
List<Object> camera;
ArrayList cameraList = new ArrayList();
QueryWrapper<TAbilityApplicationEntity> queryWrapper = new QueryWrapper<>();
@ -313,6 +302,17 @@ public class TAbilityApplicationController {
}
}
taskHandleDetailInfo = taskHandleDetailInfo.stream().map(index_ -> { // 补充审核人部门名称
if (StringUtils.isNumeric(index_.getAssignee())) {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(index_.getAssignee()));
Optional<SysDeptDTO> sysDeptDTOOptional = Optional.ofNullable(sysDeptService.get(userDTO.getDeptId()));
if (sysDeptDTOOptional.isPresent()) {
index_.setAssigneeDeptName(sysDeptDTOOptional.get().getName());
}
}
return index_;
}).collect(Collectors.toList());
boolean finalBackToFirst = backToFirst;
List<HistoryDetailDTO> finalTaskHandleDetailInfo = taskHandleDetailInfo;
return new HashMap<String, Object>() {