diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java index a5d51045..0a96dba3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvBusUserController.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -74,11 +75,15 @@ public class InvBusUserController { public BaseResponse filterUserBusList(FilterInvBusUserRequest filterInvBusUserRequest) { List responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); PageInfo pageInfo = new PageInfo<>(responses); - List actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList()); - List warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(warehouseBussinessTypeEntities); + if (pageInfo.getTotal() == 0) { + pageSimpleResponse.setList(Collections.emptyList()); + } else { + List actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList()); + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions); + pageSimpleResponse.setList(warehouseBussinessTypeEntities); + } return ResultVOUtils.success(pageSimpleResponse); }