修正查询bug
This commit is contained in:
parent
f31bf24ec2
commit
fd6b15bdaf
@ -1016,7 +1016,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
|
|||||||
|
|
||||||
if keywordTableStr != "" {
|
if keywordTableStr != "" {
|
||||||
if keywordTableStr == v.GetString("name") {
|
if keywordTableStr == v.GetString("name") {
|
||||||
keyword[table+"."+keywordTableStr+"[~]"] = keywordStr
|
data[table+"."+keywordTableStr+"[~]"] = keywordStr
|
||||||
}
|
}
|
||||||
|
|
||||||
if keywordTableStr == v.GetString("value") {
|
if keywordTableStr == v.GetString("value") {
|
||||||
@ -1026,7 +1026,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
|
|||||||
childIds = append(childIds, cv.GetString("id"))
|
childIds = append(childIds, cv.GetString("id"))
|
||||||
}
|
}
|
||||||
if len(childIds) != 0 {
|
if len(childIds) != 0 {
|
||||||
keyword[v.GetString("link")+".id"] = childIds
|
data[v.GetString("link")+".id"] = childIds
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
@ -1143,17 +1143,12 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
|
|||||||
data[k] = v
|
data[k] = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(keyword) > 1 {
|
if len(keyword) > 1 {
|
||||||
|
if data["OR"] != nil {
|
||||||
if data["AND"] != nil {
|
data = Map{"AND": data, "OR": keyword}
|
||||||
and := data.GetMap("AND")
|
|
||||||
for k, v := range keyword {
|
|
||||||
and[k] = v
|
|
||||||
}
|
|
||||||
|
|
||||||
//data = Map{"AND":Map{"OR": keyword} data, }
|
|
||||||
} else {
|
} else {
|
||||||
data["AND"] = keyword
|
data["OR"] = keyword
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user