Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 541c82410e | |||
| b680112fdb |
@@ -46,7 +46,7 @@ var TptProject = Proj{
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (column["list"] == nil || column.GetBool("list")) && column.GetString("link") != "" {
|
if (column["info"] == nil || column.GetBool("info")) && column.GetString("link") != "" {
|
||||||
seStr := "id," + column.GetString("value")
|
seStr := "id," + column.GetString("value")
|
||||||
if that.MakeCodeRouter[hotimeName].TableColumns[column.GetString("link")]["phone"] != nil {
|
if that.MakeCodeRouter[hotimeName].TableColumns[column.GetString("link")]["phone"] != nil {
|
||||||
seStr = seStr + ",phone"
|
seStr = seStr + ",phone"
|
||||||
|
|||||||
+7
-7
@@ -208,7 +208,7 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
|
|||||||
for _, ColumnName := range that.RuleConfig {
|
for _, ColumnName := range that.RuleConfig {
|
||||||
if (ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name")) ||
|
if (ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name")) ||
|
||||||
(!ColumnName.GetBool("strict") && strings.Contains(coloum.GetString("name"), ColumnName.GetString("name"))) ||
|
(!ColumnName.GetBool("strict") && strings.Contains(coloum.GetString("name"), ColumnName.GetString("name"))) ||
|
||||||
(info.GetString("name")+"."+coloum.GetString("name") == ColumnName.GetString("name")) {
|
(v.GetString("name")+"."+coloum.GetString("name") == ColumnName.GetString("name")) {
|
||||||
//全部都不需要则不加入
|
//全部都不需要则不加入
|
||||||
if ColumnName.GetBool("edit") == false && ColumnName.GetBool("list") == false && ColumnName.GetBool("info") == false {
|
if ColumnName.GetBool("edit") == false && ColumnName.GetBool("list") == false && ColumnName.GetBool("info") == false {
|
||||||
coloum["notUse"] = true
|
coloum["notUse"] = true
|
||||||
@@ -728,12 +728,12 @@ func (that *MakeCode) Add(table string, user Map, req *http.Request) Map {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if user[v.GetString("name")] != nil {
|
//if user[v.GetString("name")] != nil {
|
||||||
|
//
|
||||||
data[v.GetString("name")] = user[v.GetString("name")]
|
// data[v.GetString("name")] = user[v.GetString("name")]
|
||||||
continue
|
// continue
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
|
|
||||||
if v.GetBool("must") {
|
if v.GetBool("must") {
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
Reference in New Issue
Block a user