|
@@ -39,7 +39,29 @@ func (p *Controller) login(c *mhayaGin.Context) {
|
|
|
if v.Type == 1 {
|
|
|
rsp.AchieveTask[v.ID].Url = ret[v.ID].Url
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
+ var curId int
|
|
|
+ for _, v := range rsp.AchieveTask {
|
|
|
+ if v.Type == 2 {
|
|
|
+ if v.Status == 1 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if curId == 0 {
|
|
|
+ curId = v.ID
|
|
|
+ }
|
|
|
+ if v.ID < curId {
|
|
|
+ curId = v.ID
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range rsp.AchieveTask {
|
|
|
+ if v.Type == 2 {
|
|
|
+ if v.ID != curId {
|
|
|
+ delete(rsp.AchieveTask, v.ID)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
code.RenderResult(c, code.OK, rsp)
|
|
@@ -70,8 +92,27 @@ func (p *Controller) start(c *mhayaGin.Context) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if len(rsp.Password) > 0 {
|
|
|
- rsp.IsSetPwd = true
|
|
|
+ var curId int
|
|
|
+ for _, v := range rsp.AchieveTask {
|
|
|
+ if v.Type == 2 {
|
|
|
+ if v.Status == 1 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if curId == 0 {
|
|
|
+ curId = v.ID
|
|
|
+ }
|
|
|
+ if v.ID < curId {
|
|
|
+ curId = v.ID
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range rsp.AchieveTask {
|
|
|
+ if v.Type == 2 {
|
|
|
+ if v.ID != curId {
|
|
|
+ delete(rsp.AchieveTask, v.ID)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
code.RenderResult(c, code.OK, rsp)
|