diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index e04849ab0..aa719956b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -456,8 +456,7 @@ public class PurApplyController { public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) { List purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest); - PageInfo pageInfo; - pageInfo = new PageInfo<>(purApplyDetailEntities); + PageInfo pageInfo = new PageInfo<>(purApplyDetailEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(purApplyDetailEntities); @@ -475,7 +474,10 @@ public class PurApplyController { public BaseResponse getDetailList(PurApplyDetailRequest purApplyDetailRequest) { List list = purApplyDetailService.getDetailList(purApplyDetailRequest); PageInfo pageInfo = new PageInfo<>(list); - return ResultVOUtils.page(pageInfo); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); } /** diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java index 22d1578dc..ea72b557f 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java @@ -85,7 +85,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl