|
@@ -1662,13 +1662,18 @@ func MergeArray(dest []interface{}, src []interface{}) (result []interface{}) {
|
|
|
if v["notkey"] != nil {
|
|
|
otkeyArr := common.ObjArrToStringArr(v["notkey"].([]interface{}))
|
|
|
for _, keyV := range otkeyArr {
|
|
|
- notkey += fmt.Sprintf(",%s", common.InterfaceToStr(keyV))
|
|
|
+ if common.InterfaceToStr(keyV) != "" {
|
|
|
+ notkey += fmt.Sprintf(",%s", common.InterfaceToStr(keyV))
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
if v["key"] != nil {
|
|
|
keyArr := common.ObjArrToStringArr(v["key"].([]interface{}))
|
|
|
for _, keyV := range keyArr {
|
|
|
- key += fmt.Sprintf(",%s", common.InterfaceToStr(keyV))
|
|
|
+ if common.InterfaceToStr(keyV) != "" {
|
|
|
+ key += fmt.Sprintf(",%s", common.InterfaceToStr(keyV))
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if v["matchway"] != nil {
|
|
@@ -1677,7 +1682,9 @@ func MergeArray(dest []interface{}, src []interface{}) (result []interface{}) {
|
|
|
if v["appendkey"] != nil {
|
|
|
appendkeyArr := common.ObjArrToStringArr(v["appendkey"].([]interface{}))
|
|
|
for _, keyV := range appendkeyArr {
|
|
|
- appendkey += fmt.Sprintf(",%s", common.InterfaceToStr(keyV))
|
|
|
+ if common.InterfaceToStr(keyV) != "" {
|
|
|
+ appendkey += fmt.Sprintf(",%s", common.InterfaceToStr(keyV))
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
k := fmt.Sprintf("%s_____%s_____%s_____%s", notkey, key, matchway, appendkey)
|