|
@@ -600,7 +600,7 @@ func Paginate(slice []*pasturePb.CalendarToDoList, req *pasturePb.CalendarToDoRe
|
|
|
start := (pagination.Page - 1) * pagination.PageSize
|
|
|
|
|
|
// 如果起始索引超出切片长度,返回空切片
|
|
|
- if start >= int32(len(slice)) {
|
|
|
+ if start >= int32(len(newSlice)) {
|
|
|
return []*pasturePb.CalendarToDoList{}
|
|
|
}
|
|
|
|
|
@@ -608,12 +608,12 @@ func Paginate(slice []*pasturePb.CalendarToDoList, req *pasturePb.CalendarToDoRe
|
|
|
end := start + pagination.PageSize
|
|
|
|
|
|
// 如果结束索引超出切片长度,调整到切片末尾
|
|
|
- if end > int32(len(slice)) {
|
|
|
- end = int32(len(slice))
|
|
|
+ if end > int32(len(newSlice)) {
|
|
|
+ end = int32(len(newSlice))
|
|
|
}
|
|
|
|
|
|
// 返回分页后的切片
|
|
|
- return slice[start:end]
|
|
|
+ return newSlice[start:end]
|
|
|
}
|
|
|
|
|
|
func ProgressList(dataList []*pasturePb.CalendarToDoList, toDayCompletedCountMap map[string]int32) map[string]*pasturePb.ProgressList {
|