|
@@ -1075,15 +1075,21 @@ func GetMactchKeys(match []map[string]string, data map[string]interface{}) (stri
|
|
|
keyWord, keyType = KeyWordToDatas(types, winner, key, keyWord, keyType, "s_winner")
|
|
|
}
|
|
|
}
|
|
|
- keyMap := map[string]bool{}
|
|
|
- keyArr := []string{}
|
|
|
+ keyMap, keyTypeMap := map[string]bool{}, map[string]bool{}
|
|
|
+ keyArr, keyTypeArr := []string{}, []string{}
|
|
|
for _, key := range keyWord {
|
|
|
keyMap[key] = true
|
|
|
}
|
|
|
for k, _ := range keyMap {
|
|
|
keyArr = append(keyArr, k)
|
|
|
}
|
|
|
- return strings.Join(keyArr, ","), strings.Join(keyType, ",")
|
|
|
+ for _, key := range keyType {
|
|
|
+ keyTypeMap[key] = true
|
|
|
+ }
|
|
|
+ for k, _ := range keyTypeMap {
|
|
|
+ keyTypeArr = append(keyTypeArr, k)
|
|
|
+ }
|
|
|
+ return strings.Join(keyArr, ","), strings.Join(keyTypeArr, ",")
|
|
|
}
|
|
|
|
|
|
func KeyWordToDatas(types, item, key string, keyWord []string, keyType []string, tag string) ([]string, []string) {
|