Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
6115e69bc8
@ -46,6 +46,13 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe
|
|||||||
list.Landid = land.Id
|
list.Landid = land.Id
|
||||||
update["landid"] = land.Id
|
update["landid"] = land.Id
|
||||||
} else {
|
} else {
|
||||||
|
if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
|
||||||
|
errdata = &pb.ErrorData{
|
||||||
|
Code: pb.ErrorCode_DBError,
|
||||||
|
Message: err.Error(),
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
var uids []string
|
var uids []string
|
||||||
etime := this.module.modelLand.GetEndTime()
|
etime := this.module.modelLand.GetEndTime()
|
||||||
// 清理岛数据
|
// 清理岛数据
|
||||||
@ -74,13 +81,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe
|
|||||||
update["etime"] = land.Etime
|
update["etime"] = land.Etime
|
||||||
}
|
}
|
||||||
|
|
||||||
if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
|
|
||||||
errdata = &pb.ErrorData{
|
|
||||||
Code: pb.ErrorCode_DBError,
|
|
||||||
Message: err.Error(),
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if len(list.Source) == 0 {
|
if len(list.Source) == 0 {
|
||||||
list.Source, err = this.module.modelPlunder.refreshGoodsInfo()
|
list.Source, err = this.module.modelPlunder.refreshGoodsInfo()
|
||||||
|
Loading…
Reference in New Issue
Block a user