Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 876e3b1f45 | |||
| d6e940803d |
@@ -546,11 +546,11 @@ var TptProject = Proj{
|
|||||||
|
|
||||||
column := that.MakeCodeRouter[hotimeName].TableColumns[tableName][k]
|
column := that.MakeCodeRouter[hotimeName].TableColumns[tableName][k]
|
||||||
|
|
||||||
if column == nil {
|
if column == nil || column["link"] == nil || !(column["list"] == nil || column["list"] == true) || v.GetCeilInt64(column.GetString("name")) == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (column["list"] == nil || column["list"] == true) && column["name"] == "parent_id" && column.GetString("link") != "" {
|
if column["name"] == "parent_id" {
|
||||||
|
|
||||||
parentC := that.Db.Get(column.GetString("link"), column.GetString("value"), Map{"id": v.GetCeilInt(k)})
|
parentC := that.Db.Get(column.GetString("link"), column.GetString("value"), Map{"id": v.GetCeilInt(k)})
|
||||||
v[column.GetString("link")+"_"+column.GetString("name")+"_"+column.GetString("value")] = ""
|
v[column.GetString("link")+"_"+column.GetString("name")+"_"+column.GetString("value")] = ""
|
||||||
@@ -559,8 +559,7 @@ var TptProject = Proj{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if column.GetString("link") != "" &&
|
if column.GetString("name") != "parent_id" {
|
||||||
column.GetString("name") != "parent_id" {
|
|
||||||
reStr := ""
|
reStr := ""
|
||||||
|
|
||||||
if column.GetString("value") == "name" && that.MakeCodeRouter[hotimeName].TableColumns[column.GetString("link")]["nickname"] != nil {
|
if column.GetString("value") == "name" && that.MakeCodeRouter[hotimeName].TableColumns[column.GetString("link")]["nickname"] != nil {
|
||||||
@@ -572,7 +571,7 @@ var TptProject = Proj{
|
|||||||
}
|
}
|
||||||
reStr += column.GetString("value")
|
reStr += column.GetString("value")
|
||||||
|
|
||||||
joinData := that.Db.Get(column.GetString("link"), reStr, Map{"id": v.GetCeilInt(column.GetString("name"))})
|
joinData := that.Db.Get(column.GetString("link"), reStr, Map{"id": v.GetCeilInt64(column.GetString("name"))})
|
||||||
|
|
||||||
if joinData != nil {
|
if joinData != nil {
|
||||||
for kj, vj := range joinData {
|
for kj, vj := range joinData {
|
||||||
|
|||||||
+383
-383
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user