From feddf2a8de2e3e19a75fd9a6ac734f3212e25285 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Jan 2025 14:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1=20?=
 =?UTF-8?q?=E5=AE=9E=E7=89=A9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TaskCenterRewardController.java           | 9 ++++++++-
 .../sqx/modules/taskCenter/entity/TaskCenterReward.java  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java
index 0f0f5d5a..706a2781 100644
--- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java
+++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java
@@ -2,7 +2,11 @@ package com.sqx.modules.taskCenter.controller;
 
 
 import cn.hutool.core.date.DateUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sqx.common.utils.PageUtils;
 import com.sqx.modules.app.annotation.Login;
+import com.sqx.modules.app.entity.App;
 import com.sqx.modules.taskCenter.entity.TaskCenterRecord;
 import com.sqx.modules.taskCenter.entity.TaskCenterReward;
 import com.sqx.modules.taskCenter.service.TaskCenterRecordService;
@@ -80,7 +84,10 @@ public class TaskCenterRewardController {
     @GetMapping("/selectTaskCenterReward")
     @ApiOperation("查询任务奖励")
     public Result selectTaskCenterReward(Integer page, Integer limit, TaskCenterReward taskCenterReward) {
-        return Result.success().put("data", taskCenterRewardService.page(new Page<>(page, limit), new QueryWrapper<>(taskCenterReward).orderByDesc("id")));
+        PageHelper.startPage(page == null ? 0 : page, limit == null ? 10 : limit);
+        List<TaskCenterReward> list = taskCenterRewardService.list(new QueryWrapper<>(taskCenterReward).orderByDesc("id"));
+        PageInfo<TaskCenterReward> pageInfo = new PageInfo<>(list);
+        return Result.success().put("data", PageUtils.page(pageInfo, true));
     }
 
     @Login
diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
index c6bff50a..592fb8ca 100644
--- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
+++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java
@@ -29,7 +29,7 @@ public class TaskCenterReward extends Model<TaskCenterReward> {
     private String img;
     @ApiModelProperty("奖励名称")
     private String name;
-    @ApiModelProperty("奖励类型 1 金币 2 现金红包  3  4  5  9 大转盘抽奖次数")
+    @ApiModelProperty("奖励类型 1 金币 2 现金红包  3实物  4  5  9 大转盘抽奖次数")
     private Integer type;
     @TableField(exist = false)
     @JsonSerialize(using = ToStringSerializer.class)