|
|
@@ -2001,9 +2001,9 @@ public class KwtWaybillOrderService {
|
|
|
}};
|
|
|
createBys = createBys.stream().distinct().collect(Collectors.toList());
|
|
|
Map<Long, UserCacheResDto> users = remoteSystemService.queryUserCacheMapByIds(createBys);
|
|
|
- UserCacheResDto loadUser = users == null ? null : users.get(loadTicket.getUpdateBy());
|
|
|
- UserCacheResDto unloadUser = users == null ? null : users.get(unloadTicket.getUpdateBy());
|
|
|
- UserCacheResDto approver = users == null ? null : users.get(track.getCreateBy());
|
|
|
+ UserCacheResDto loadUser = users == null ? null : users.get(loadTicket != null ? loadTicket.getUpdateBy() : null);
|
|
|
+ UserCacheResDto unloadUser = users == null ? null : users.get(unloadTicket != null ? unloadTicket.getUpdateBy() : null);
|
|
|
+ UserCacheResDto approver = users == null ? null : users.get(track != null ? track.getCreateBy() : null);
|
|
|
|
|
|
Map result = new HashMap();
|
|
|
result.put("wOrderId", wOrderId);
|