zyx007/renren-security
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
飞光！飞光！ 2023-06-19 20:30:33 +08:00
commit 6dbd03f880
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
renren-admin/src/main/java/io/renren/modules/takeout/controller/OrdersController.java
View File

@ -59,7 +59,12 @@ public class OrdersController {
List<OrdersDTO> ordersDTOS = page.getList().stream().map(ordersDTO -> { List<OrdersDTO> ordersDTOS = page.getList().stream().map(ordersDTO -> {
UserDTO userDTO = userService.get(ordersDTO.getUserId()); UserDTO userDTO = userService.get(ordersDTO.getUserId());
ordersDTO.setUserName(userDTO.getName()); if(userDTO!=null) {
ordersDTO.setUserName(userDTO.getName());
}
else {
ordersDTO.setUserName("账号已注销");
}
return ordersDTO; return ordersDTO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
page.setList(ordersDTOS); page.setList(ordersDTOS);