From f477c2e0683c685cf036d50e09ab424e79afa83d Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 5 Sep 2022 09:58:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E6=9C=AA?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=87=BA=E6=89=80=E6=9C=89=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inventory/InvBusUserController.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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); }