diff --git a/modules/plunder/model_land.go b/modules/plunder/model_land.go index 99fc70fc9..65556fffd 100644 --- a/modules/plunder/model_land.go +++ b/modules/plunder/model_land.go @@ -80,7 +80,9 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand } } } - info, _ = this.module.modelPlunder.queryPlunderInfos(uids, land.Id) + if info, err = this.module.modelPlunder.queryPlunderInfos(uids, land.Id); err != nil { + return + } for _, v := range info { if v.Landid != "" { // 过滤 diff --git a/modules/plunder/model_plunder.go b/modules/plunder/model_plunder.go index e30225c0a..6d1adbb87 100644 --- a/modules/plunder/model_plunder.go +++ b/modules/plunder/model_plunder.go @@ -128,19 +128,19 @@ func (this *modelPlunder) queryPlunderInfos(uids []string, landid string) (data var ( mp map[string]struct{} // 没找到的数据 results []*pb.DBPlunder - onfound []string + //onfound []string newdata map[string]interface{} = make(map[string]interface{}) unfound []string ) results = make([]*pb.DBPlunder, 0) mp = make(map[string]struct{}) - if onfound, err = this.Gets(uids, &results); err != nil { + if _, err = this.Gets(uids, &results); err != nil { this.module.Errorln(err) return } - for _, v := range onfound { - mp[v] = struct{}{} + for _, v := range results { + mp[v.Uid] = struct{}{} } for _, v := range uids { if _, ok := mp[v]; !ok { @@ -167,10 +167,11 @@ func (this *modelPlunder) queryPlunderInfos(uids []string, landid string) (data break } } - - if err = this.Adds(newdata); err != nil { - this.module.Errorln(err) - return + if len(newdata) > 0 { + if err = this.Adds(newdata); err != nil { + this.module.Errorln(err) + return + } } for _, v := range results {