src/front/group.go

@@ -994,18 +994,21 @@ func (f *Front) GroupExportData() {
 		for _, l := range *list {
 			baseinfo := l["v_baseinfo"].(map[string]interface{})
 			if baseinfo["package"] != nil {
-				var pkg []map[string]interface{} // 字段兼容处理
+				var pkg map[string]interface{}
 				if m, ok := baseinfo["package"].(map[string]interface{}); ok {
-					pkg = []map[string]interface{}{m}
+					pkg = m
 				} else if slice, o1 := baseinfo["package"].([]map[string]interface{}); o1 {
-					pkg = slice
+					for i, m2 := range slice {
+						pkg[fmt.Sprint(i)] = m2
+					}
 				}
 				for _, p := range pkg {
+					p1 := p.(map[string]interface{})
 					row := sheet.AddRow()
 					winner := []string{}
 					bidamount := float64(0)
-					if p["winner_all"] != nil {
-						if all := p["winner_all"].([]interface{}); all != nil {
+					if p1["winner_all"] != nil {
+						if all := p1["winner_all"].([]interface{}); all != nil {
 							if len(all) > 0 {
 								for _, a := range all {
 									a1 := a.(map[string]interface{})
@@ -1040,7 +1043,6 @@ func (f *Front) GroupExportData() {
 					if l["is_repeat"] != nil {
 						row.AddCell().SetValue(l["is_repeat"])
 					}
-
 				}
 			} else {
 				row := sheet.AddRow()

src/front/remark.go

@@ -724,7 +724,6 @@ func GetNextDataId1(id, coll, tid, tag string) string {
 	} else {
 		nextIdQuery["i_ckdata"] = 2
 	}
-	qu.Debug(nextIdQuery)
 	one, _ := util.Mgo.Find(coll, nextIdQuery, `{"_id":1}`, `{"_id":1}`, true, 0, 1)
 	if len(*one) == 1 && len((*one)[0]) > 0 {
 		return mongodb.BsonIdToSId((*one)[0]["_id"])