diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index 286e7bc8..fbad23cf 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -614,7 +614,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService { XhpcCommunityPersonnel xhpcCommunityPersonnel = xhpcCommunityPersonnelMapper.selectByAccount(queryRechargingRecordRequest.getUserAccount()); List xhpcRechargeOrderList1 = xhpcRechargeOrderMapper.selectByUserId(xhpcCommunityPersonnel.getCommunityPersonnelId(), queryRechargingRecordRequest.getCurrentPage(), queryRechargingRecordRequest.getItems()); if (xhpcRechargeOrderList1.isEmpty()) { - R.ok(queryRechargingRecordResponse); + return R.ok(queryRechargingRecordResponse); } Long recordsCount1 = xhpcRechargeOrderMapper.selectCountByUserId(xhpcCommunityPersonnel.getCommunityId()); queryRechargingRecordResponse.setTotalItems(recordsCount1); @@ -626,9 +626,9 @@ public class XhpcCardServiceImpl implements IXhpcCardService { return R.ok(queryRechargingRecordResponse); case 3: XhpcCustomersPersonnel xhpcCustomersPersonnel = xhpcCustomersPersonnelMapper.selectByAccount(queryRechargingRecordRequest.getUserAccount()); - List xhpcRechargeOrderList2 = xhpcRechargeOrderMapper.selectByUserId(xhpcCustomersPersonnel.getCustomersId(), queryRechargingRecordRequest.getCurrentPage(), queryRechargingRecordRequest.getItems()); + List xhpcRechargeOrderList2 = xhpcRechargeOrderMapper.selectByUserId(xhpcCustomersPersonnel.getCustomersPersonnelId(), queryRechargingRecordRequest.getCurrentPage(), queryRechargingRecordRequest.getItems()); if (xhpcRechargeOrderList2.isEmpty()) { - R.ok(queryRechargingRecordResponse); + return R.ok(queryRechargingRecordResponse); } Long recordsCount2 = xhpcRechargeOrderMapper.selectCountByUserId(xhpcCustomersPersonnel.getCustomersId()); queryRechargingRecordResponse.setTotalItems(recordsCount2);