|
|
@@ -98,7 +98,6 @@ public class AdminController {
|
|
|
wrapper.like(User::getPhone, String.valueOf(params.get("phone")));
|
|
|
}
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
Page<User> result = userMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
@@ -186,7 +185,6 @@ public class AdminController {
|
|
|
}
|
|
|
wrapper.orderByDesc(User::getUpdatedAt).last("LIMIT 50");
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
List<User> users = userMapper.selectList(wrapper);
|
|
|
// 清除密码
|
|
|
for (User u : users) {
|
|
|
@@ -276,7 +274,6 @@ public class AdminController {
|
|
|
}
|
|
|
wrapper.orderByDesc(Task::getCreatedAt);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
Page<Task> result = taskMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
@@ -313,7 +310,6 @@ public class AdminController {
|
|
|
}
|
|
|
wrapper.orderByDesc(Reward::getCreatedAt);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
Page<Reward> result = rewardMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
@@ -466,7 +462,6 @@ public class AdminController {
|
|
|
}
|
|
|
wrapper.orderByDesc(PointsLog::getCreatedAt);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
Page<PointsLog> result = pointsLogMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
@@ -500,7 +495,6 @@ public class AdminController {
|
|
|
}
|
|
|
wrapper.orderByDesc(Family::getCreatedAt);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
Page<Family> result = familyMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
@@ -529,14 +523,12 @@ public class AdminController {
|
|
|
LambdaQueryWrapper<User> parentWrapper = new LambdaQueryWrapper<>();
|
|
|
parentWrapper.eq(User::getFamilyId, id).eq(User::getRole, "parent");
|
|
|
SortUtil.applySort(parentWrapper);
|
|
|
- SortUtil.applySort(parentWrapper);
|
|
|
java.util.List<User> parents = userMapper.selectList(parentWrapper);
|
|
|
|
|
|
// 查询孩子
|
|
|
LambdaQueryWrapper<FamilyMember> childWrapper = new LambdaQueryWrapper<>();
|
|
|
childWrapper.eq(FamilyMember::getFamilyId, id);
|
|
|
SortUtil.applySort(childWrapper);
|
|
|
- SortUtil.applySort(childWrapper);
|
|
|
java.util.List<FamilyMember> children = familyMemberMapper.selectList(childWrapper);
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
@@ -658,7 +650,6 @@ public class AdminController {
|
|
|
}
|
|
|
wrapper.orderByDesc(TaskTemplate::getCreatedAt);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
Page<TaskTemplate> result = taskTemplateMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
@@ -711,7 +702,6 @@ public class AdminController {
|
|
|
.isNotNull(User::getRealName)
|
|
|
.orderByDesc(User::getUpdatedAt);
|
|
|
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
Page<User> result = userMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
@@ -819,7 +809,6 @@ public class AdminController {
|
|
|
.isNotNull(User::getRealName)
|
|
|
.orderByDesc(User::getUpdatedAt);
|
|
|
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
Page<User> result = userMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
@@ -1138,7 +1127,6 @@ public class AdminController {
|
|
|
|
|
|
Page<MemberUpgradeRecord> pageParam = new Page<>(page, size);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
Page<MemberUpgradeRecord> result = memberUpgradeRecordMapper.selectPage(pageParam, wrapper);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
@@ -1353,7 +1341,6 @@ public class AdminController {
|
|
|
LambdaQueryWrapper<User> userWrapper = new LambdaQueryWrapper<>();
|
|
|
userWrapper.like(User::getNickname, kw).select(User::getId);
|
|
|
SortUtil.applySort(userWrapper);
|
|
|
- SortUtil.applySort(userWrapper);
|
|
|
java.util.List<User> matchedUsers = userMapper.selectList(userWrapper);
|
|
|
java.util.List<Long> matchedIds = new java.util.ArrayList<>();
|
|
|
for (User u : matchedUsers) { matchedIds.add(u.getId()); }
|
|
|
@@ -1365,7 +1352,6 @@ public class AdminController {
|
|
|
}
|
|
|
wrapper.orderByDesc(AssessmentAppointment::getCreatedAt);
|
|
|
|
|
|
- SortUtil.applySort(wrapper);
|
|
|
SortUtil.applySort(wrapper);
|
|
|
Page<AssessmentAppointment> result = assessmentAppointmentMapper.selectPage(pageParam, wrapper);
|
|
|
|