优化性能
This commit is contained in:
+43
-41
@@ -847,9 +847,9 @@ func (that *MakeCode) Delete(table string, req *http.Request) Map {
|
||||
return data
|
||||
}
|
||||
|
||||
func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Request, db *db.HoTimeDB) (string, Map, Map) {
|
||||
func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Request, db *db.HoTimeDB) (string, Map) {
|
||||
reStr := ""
|
||||
leftJoin := Map{}
|
||||
//leftJoin := Map{}
|
||||
//data := Map{}
|
||||
if data == nil {
|
||||
data = Map{}
|
||||
@@ -881,46 +881,48 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req
|
||||
|
||||
if v["list"] != false {
|
||||
|
||||
if v.GetString("link") != "" &&
|
||||
v.GetString("name") != "parent_id" {
|
||||
//if v.GetString("link") != "" &&
|
||||
// v.GetString("name") != "parent_id" {
|
||||
//
|
||||
// reStr += table + "." + v.GetString("name") + ","
|
||||
// //+
|
||||
// // v.GetString("link") + "." + v.GetString("value") + " AS " +
|
||||
// // v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
|
||||
//
|
||||
// if v.GetString("value") == "name" && that.TableColumns[v.GetString("link")]["nickname"] != nil {
|
||||
// reStr += v.GetString("link") + ".nickname AS " +
|
||||
// v.GetString("link") + "_" + v.GetString("name") + "_nickname,"
|
||||
// }
|
||||
//
|
||||
// if that.TableColumns[v.GetString("link")]["phone"] != nil {
|
||||
// reStr += v.GetString("link") + ".phone AS " +
|
||||
// v.GetString("link") + "_" + v.GetString("name") + "_phone,"
|
||||
// }
|
||||
//
|
||||
// leftJoin["[>]"+v.GetString("link")] =
|
||||
// table + "." + v.GetString("name") + "=" +
|
||||
// v.GetString("link") + ".id"
|
||||
//
|
||||
// if v.GetString("link") == "admin" {
|
||||
// hasUser = true
|
||||
// }
|
||||
//
|
||||
// reqValue := req.FormValue(v.GetString("name"))
|
||||
// if reqValue != "" {
|
||||
// data[table+"."+v.GetString("name")] = reqValue
|
||||
// }
|
||||
//
|
||||
//} else {
|
||||
|
||||
reStr += table + "." + v.GetString("name") + "," +
|
||||
v.GetString("link") + "." + v.GetString("value") + " AS " +
|
||||
v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
|
||||
reStr += table + "." + v.GetString("name") + ","
|
||||
//}
|
||||
|
||||
if v.GetString("value") == "name" && that.TableColumns[v.GetString("link")]["nickname"] != nil {
|
||||
reStr += v.GetString("link") + ".nickname AS " +
|
||||
v.GetString("link") + "_" + v.GetString("name") + "_nickname,"
|
||||
}
|
||||
|
||||
if that.TableColumns[v.GetString("link")]["phone"] != nil {
|
||||
reStr += v.GetString("link") + ".phone AS " +
|
||||
v.GetString("link") + "_" + v.GetString("name") + "_phone,"
|
||||
}
|
||||
|
||||
leftJoin["[>]"+v.GetString("link")] =
|
||||
table + "." + v.GetString("name") + "=" +
|
||||
v.GetString("link") + ".id"
|
||||
if v.GetString("link") == "admin" {
|
||||
hasUser = true
|
||||
}
|
||||
|
||||
reqValue := req.FormValue(v.GetString("name"))
|
||||
if reqValue != "" {
|
||||
data[table+"."+v.GetString("name")] = reqValue
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
reStr += table + "." + v.GetString("name") + ","
|
||||
}
|
||||
|
||||
if v["name"] == "parent_id" && v.GetString("link") != "" {
|
||||
leftJoin["[>]"+v.GetString("link")+" selfParent"] =
|
||||
"selfParent.id=" +
|
||||
v.GetString("link") + "." + v.GetString("name")
|
||||
reStr += "selfParent." + v.GetString("value") + " AS " + v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
|
||||
}
|
||||
//if v["name"] == "parent_id" && v.GetString("link") != "" {
|
||||
// leftJoin["[>]"+v.GetString("link")+" selfParent"] =
|
||||
// "selfParent.id=" +
|
||||
// v.GetString("link") + "." + v.GetString("name")
|
||||
// reStr += "selfParent." + v.GetString("value") + " AS " + v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
|
||||
//}
|
||||
|
||||
//准备加入索引权限
|
||||
if v.GetString("link") != "" &&
|
||||
@@ -1273,5 +1275,5 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req
|
||||
}
|
||||
}
|
||||
|
||||
return reStr, leftJoin, where
|
||||
return reStr, where
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user