Commit 1ba3de83959ad56158212d2bd337d4770b690918
1 parent
68652b9f
Exists in
master
and in
4 other branches
提交
Showing
1 changed file
with
9 additions
and
1 deletions
Show diff stats
src/HttpServer/logic/function.go
| @@ -230,7 +230,14 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList) *TaskList{ | @@ -230,7 +230,14 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList) *TaskList{ | ||
| 230 | curtype = cfg.TaskType | 230 | curtype = cfg.TaskType |
| 231 | } | 231 | } |
| 232 | }else if val.Taskstatus == 1 { | 232 | }else if val.Taskstatus == 1 { |
| 233 | - //未完成 不做处理 | 233 | + //未完成 返回第一个 |
| 234 | + if curtype == cfg.TaskType { | ||
| 235 | + continue | ||
| 236 | + }else { | ||
| 237 | + //将类型加入返回列表 | ||
| 238 | + newlist.Taskdata = append(newlist.Taskdata,list.Taskdata[k]) | ||
| 239 | + curtype = cfg.TaskType | ||
| 240 | + } | ||
| 234 | }else { | 241 | }else { |
| 235 | //已领取 需要判断一下是否最后一项 | 242 | //已领取 需要判断一下是否最后一项 |
| 236 | if k!= len(list.Taskdata)-1 { | 243 | if k!= len(list.Taskdata)-1 { |
| @@ -259,6 +266,7 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList) *TaskList{ | @@ -259,6 +266,7 @@ func (uinfo *UserData) CalcAchieveList(list *TaskList) *TaskList{ | ||
| 259 | 266 | ||
| 260 | //将返回的列表排序 | 267 | //将返回的列表排序 |
| 261 | sort.Sort(newlist) | 268 | sort.Sort(newlist) |
| 269 | + logger.Info("CalcAchieveList alist=%v",newlist) | ||
| 262 | return newlist | 270 | return newlist |
| 263 | } | 271 | } |
| 264 | 272 |