|
@@ -41,15 +41,14 @@ public class TFFlowLogServiceImpl extends ServiceImpl<TFFlowLogMapper, TFFlowLog
|
|
|
public List<TFFlowLogResult> findByObjectId(Long objectId) {
|
|
|
List<TFFlowLogResult> tfFlowLogResultList = this.baseMapper.findByObjectId(objectId);
|
|
|
for (TFFlowLogResult t : tfFlowLogResultList) {
|
|
|
- TFFlowLog tfFlowLog = this.baseMapper.findByLastFlowLog(t.getFlowId());
|
|
|
- if (Objects.nonNull(tfFlowLog) && Objects.nonNull(tfFlowLog.getPendApproveId())) {
|
|
|
- List<String> userList = Arrays.asList(tfFlowLog.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
|
|
|
+ if (Objects.nonNull(t) && Objects.nonNull(t.getPendApproveId())) {
|
|
|
+ List<String> userList = Arrays.asList(t.getPendApproveId().split(SystemConstant.LIST_JOIN_SPLIT));
|
|
|
List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(userList.stream().map(s -> Long.parseLong(s)).collect(Collectors.toList()));
|
|
|
List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
|
|
|
t.setPendApproveUserName(StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
|
|
|
}
|
|
|
- if (Objects.nonNull(tfFlowLog) && Objects.nonNull(tfFlowLog.getApproveId())) {
|
|
|
- List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(Arrays.asList(tfFlowLog.getApproveId()));
|
|
|
+ if (Objects.nonNull(t) && Objects.nonNull(t.getApproveId())) {
|
|
|
+ List<OrgUserNameDto> orgUserNameDtoList = sysUserService.findOrgUserName(Arrays.asList(t.getApproveId()));
|
|
|
List<String> userName = orgUserNameDtoList.stream().map(s -> s.getOrgUserName()).collect(Collectors.toList());
|
|
|
t.setApproveUserName(StringUtils.join(userName, SystemConstant.LIST_JOIN_SPLIT));
|
|
|
}
|