Commit 2e50ae02 authored by lining's avatar lining

fix: 分页失效问题

parent 43e292b4
...@@ -136,8 +136,6 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> { ...@@ -136,8 +136,6 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
public Result<PageInfoVO<ServiceOrderVO>> getPage(PageServiceOrderDTO dto, Long userId) { public Result<PageInfoVO<ServiceOrderVO>> getPage(PageServiceOrderDTO dto, Long userId) {
log.info("order getPage dto: {}, userId: {}", dto, userId); log.info("order getPage dto: {}, userId: {}", dto, userId);
PageHelper.startPage(dto.getPage(), dto.getSize());
User user = userMapper.selectByPrimaryKey(userId); User user = userMapper.selectByPrimaryKey(userId);
if (Objects.isNull(user) if (Objects.isNull(user)
|| (!user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId()) && !user.getRoleType().equals(ServiceUserTypeEnum.VALUATOR.getId()))) { || (!user.getRoleType().equals(ServiceUserTypeEnum.ADMIN.getId()) && !user.getRoleType().equals(ServiceUserTypeEnum.VALUATOR.getId()))) {
...@@ -148,6 +146,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> { ...@@ -148,6 +146,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
throw new ServiceException(BizCodeEnum.SERVICE_ORDER_STATUS_ERROR); throw new ServiceException(BizCodeEnum.SERVICE_ORDER_STATUS_ERROR);
} }
PageHelper.startPage(dto.getPage(), dto.getSize());
List<ServiceOrder> serviceOrderList = serviceOrderMapper.selectServiceOrderPage( List<ServiceOrder> serviceOrderList = serviceOrderMapper.selectServiceOrderPage(
BizConstants.OrderConstants.FRONT_BACK_ORDER_STATUS_MAP.get(dto.getOrderStatus()), BizConstants.OrderConstants.FRONT_BACK_ORDER_STATUS_MAP.get(dto.getOrderStatus()),
dto.getMonth(), dto.getMonth(),
...@@ -162,12 +161,11 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> { ...@@ -162,12 +161,11 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
public Result<PageInfoVO<ServiceOrderVO>> getMinePage(PageServiceOrderDTO dto, Long userId) { public Result<PageInfoVO<ServiceOrderVO>> getMinePage(PageServiceOrderDTO dto, Long userId) {
log.info("order getMinePage dto: {}, userId: {}", dto, userId); log.info("order getMinePage dto: {}, userId: {}", dto, userId);
PageHelper.startPage(dto.getPage(), dto.getSize());
if (!BizConstants.OrderConstants.FRONT_BACK_ORDER_STATUS_MAP.containsKey(dto.getOrderStatus())) { if (!BizConstants.OrderConstants.FRONT_BACK_ORDER_STATUS_MAP.containsKey(dto.getOrderStatus())) {
throw new ServiceException(BizCodeEnum.SERVICE_ORDER_STATUS_ERROR); throw new ServiceException(BizCodeEnum.SERVICE_ORDER_STATUS_ERROR);
} }
PageHelper.startPage(dto.getPage(), dto.getSize());
List<ServiceOrder> serviceOrderList = serviceOrderMapper.selectServiceOrderMinePage( List<ServiceOrder> serviceOrderList = serviceOrderMapper.selectServiceOrderMinePage(
BizConstants.OrderConstants.FRONT_BACK_ORDER_STATUS_MAP.get(dto.getOrderStatus()), BizConstants.OrderConstants.FRONT_BACK_ORDER_STATUS_MAP.get(dto.getOrderStatus()),
dto.getMonth(), dto.getMonth(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment