diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 7acd450e..ef705535 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -47,7 +47,7 @@ public class TaskCenterServiceImpl extends ServiceImpl taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper().eq("shows", 1).orderByAsc("sort", "type")); + List taskPage = baseMapper.selectList(new QueryWrapper().eq("shows", 1).orderByAsc("sort", "type")); boolean todaySign = true; //月 签到记录 QueryWrapper signWrapper = new QueryWrapper<>(); @@ -55,7 +55,8 @@ public class TaskCenterServiceImpl extends ServiceImpl signRecordList = signRecordService.list(signWrapper); - for (TaskCenter s : taskPage.getRecords()) { + TaskCenter reTaskCenter = null; + for (TaskCenter s : taskPage) { switch (s.getType()) { //签到任务 case 2: @@ -102,20 +103,21 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { - s.setButtonTitle("已领取"); - s.setDisabled(false); - s.setNumber(null); + reTaskCenter=s; } } break; } } + if (reTaskCenter != null) { + taskPage.remove(reTaskCenter); + } return Result.success().put("data", taskPage); } @@ -168,7 +170,7 @@ public class TaskCenterServiceImpl extends ServiceImpl