From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 138b203..c468218 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -325,15 +325,12 @@
@RequestMapping(value = "/listRecord")
@ResponseBody
public Object listRecord(Integer id,String name, Integer type, String phone) {
- Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<TAppUser> tAppUsers = appUserClient.queryByNamePhone(new QueryByNamePhone(name, phone));
if(tAppUsers.size()==0){
return new ArrayList<>();
}
CouponRecordQuery ofSearch = new CouponRecordQuery();
ofSearch.setId(id);
- ofSearch.setLimit(page.getSize());
- ofSearch.setOffset(page.getCurrent());
ofSearch.setIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
ofSearch.setType(type);
List<Map<String, Object>> maps = client.listRecord(ofSearch);
--
Gitblit v1.7.1