1.修复用户未关联单据类型的情况下可以查询出所有单据类型的问题

purchase
x_z 3 years ago
parent 5a53d3f435
commit f477c2e068

@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -74,11 +75,15 @@ public class InvBusUserController {
public BaseResponse filterUserBusList(FilterInvBusUserRequest filterInvBusUserRequest) { public BaseResponse filterUserBusList(FilterInvBusUserRequest filterInvBusUserRequest) {
List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest); List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
PageInfo<InvBusUserEntity> pageInfo = new PageInfo<>(responses); PageInfo<InvBusUserEntity> pageInfo = new PageInfo<>(responses);
List<String> actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList());
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions);
PageSimpleResponse<WarehouseBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<WarehouseBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
if (pageInfo.getTotal() == 0) {
pageSimpleResponse.setList(Collections.emptyList());
} else {
List<String> actions = responses.stream().map(InvBusUserEntity::getScAction).collect(Collectors.toList());
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.selectByActions(filterInvBusUserRequest.getSubInvCode(), actions);
pageSimpleResponse.setList(warehouseBussinessTypeEntities); pageSimpleResponse.setList(warehouseBussinessTypeEntities);
}
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }

Loading…
Cancel
Save