Commit 5a863548 by fudahua

离职继承fix

parent 5518c966
...@@ -150,6 +150,8 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ ...@@ -150,6 +150,8 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
List<String> retTransferIds = infoDTOS.stream().map(dto -> dto.getHandoverTransferId()).collect(Collectors.toList()); List<String> retTransferIds = infoDTOS.stream().map(dto -> dto.getHandoverTransferId()).collect(Collectors.toList());
List<TabHandoverTransfer> transfers = handoverService.listTransferByIds(wxEnterpriseId, retTransferIds); List<TabHandoverTransfer> transfers = handoverService.listTransferByIds(wxEnterpriseId, retTransferIds);
Map<String, TabHandoverTransfer> transferMap = transfers.stream().collect(Collectors.toMap(dto -> dto.getHandoverTransferId(), dto -> dto));
List<String> midStaffIds = transfers.stream().flatMap(dto -> { List<String> midStaffIds = transfers.stream().flatMap(dto -> {
List<String> mid = new ArrayList<>(); List<String> mid = new ArrayList<>();
mid.add(dto.getHandoverStaffId()); mid.add(dto.getHandoverStaffId());
...@@ -160,8 +162,9 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ ...@@ -160,8 +162,9 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
List<TabHaobanStaff> haobanStaffs = staffService.listNoStatusByStaffIds(wxEnterpriseId, midStaffIds); List<TabHaobanStaff> haobanStaffs = staffService.listNoStatusByStaffIds(wxEnterpriseId, midStaffIds);
Map<String, String> staffNameMap = haobanStaffs.stream().collect(Collectors.toMap(dto -> dto.getStaffId(), dto -> dto.getStaffName(), (o, n) -> o)); Map<String, String> staffNameMap = haobanStaffs.stream().collect(Collectors.toMap(dto -> dto.getStaffId(), dto -> dto.getStaffName(), (o, n) -> o));
ret.getResult().forEach(dto -> { ret.getResult().forEach(dto -> {
String handoverStaff = staffNameMap.get(dto.getHandoverStaffId()); TabHandoverTransfer handoverTransfer = transferMap.get(dto.getHandoverTransferId());
String takeoverStaff = staffNameMap.get(dto.getTakeoverStaffId()); String handoverStaff = staffNameMap.get(handoverTransfer.getHandoverStaffId());
String takeoverStaff = staffNameMap.get(handoverTransfer.getTakeoverStaffId());
dto.setTakeoverStaffName(takeoverStaff); dto.setTakeoverStaffName(takeoverStaff);
dto.setHandoverStaffName(handoverStaff); dto.setHandoverStaffName(handoverStaff);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment