hoteas/iedc-go
1
0
Fork 0
forked from golang/hotime
Code Issues Pull Requests Projects Releases Wiki Activity

增加两个参数

Browse Source
This commit is contained in:
hoteas 2022-09-16 07:10:45 +08:00
parent b6ba3486d6
commit c2468a7389
2 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
code/makecode.go
View File

@ -1069,9 +1069,10 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
parentID = userData.GetCeilInt(table + "_id") parentID = userData.GetCeilInt(table + "_id")
data["OR"] = Map{table + ".id": parentID, table + ".parent_id": nil} data["OR"] = Map{table + ".id": parentID, table + ".parent_id": nil}
} else { } else {
//是否展示全部子级
if req.FormValue("showself") != "" {
where := Map{} where := Map{}
if req.FormValue("showall") == "1" {
for _, v := range reqValue { for _, v := range reqValue {
if len(where) == 0 { if len(where) == 0 {
where[table+"."+parent_idsStr] = "," + v + "," where[table+"."+parent_idsStr] = "," + v + ","
@ -1079,9 +1080,21 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
} }
where = Map{"OR": where, table + "." + parent_idsStr: "," + v + ","} where = Map{"OR": where, table + "." + parent_idsStr: "," + v + ","}
} }
data["OR"] = Map{"OR": where, table + ".id": reqValue}
} else { } else {
data[table+".parent_id"] = reqValue where[table+".parent_id"] = reqValue
}
//是否展示自己
if req.FormValue("showself") == "1" {
if len(where) == 0 {
data["OR"] = Map{table + ".id": reqValue}
} else {
data["OR"] = Map{"OR": where, table + ".id": reqValue}
}
} else {
if len(where) != 0 {
data["OR"] = where
}
} }
} }
@ -1093,14 +1106,9 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
if parent_idsStr != "" { if parent_idsStr != "" {
where := Map{} where := Map{}
if len(reqValue) == 1 { //是否全部展示
if len(where) == 0 { if req.FormValue("showall") != "1" {
where[table+"."+searchItem.GetString("name")] = reqValue[0] where[table+"."+searchItem.GetString("name")] = reqValue
} else {
where = Map{"OR": where, table + "." + searchItem.GetString("name"): reqValue[0]}
}
} else { } else {
for _, v := range reqValue { for _, v := range reqValue {
if len(where) == 0 { if len(where) == 0 {
@ -1110,6 +1118,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
where = Map{"OR": where, searchItem.GetString("link") + "." + parent_idsStr: "," + v + ","} where = Map{"OR": where, searchItem.GetString("link") + "." + parent_idsStr: "," + v + ","}
} }
} }
//用户 //用户
if userData[searchItem.GetString("name")] != nil { if userData[searchItem.GetString("name")] != nil {

37
common/func.go
View File

@ -5,6 +5,7 @@ import (
"encoding/hex" "encoding/hex"
"math" "math"
"strings" "strings"
"time"
) )
//安全锁 //安全锁
@ -36,6 +37,42 @@ func StrFirstToUpper(str string) string {
return strings.ToUpper(first) + other return strings.ToUpper(first) + other
} }
// 时间转字符串，第二个参数支持1-5对应显示年月日时分秒
func Time2Str(t *time.Time, qu ...interface{}) string {
if t == nil || t.Unix() < 0 {
return ""
}
tp := 5
if len(qu) != 0 {
tp = (qu[0]).(int)
}
switch tp {
case 1:
return t.Format("2006-01")
case 2:
return t.Format("2006-01-02")
case 3:
return t.Format("2006-01-02 15")
case 4:
return t.Format("2006-01-02 15:04")
case 5:
return t.Format("2006-01-02 15:04:05")
case 12:
return t.Format("01-02")
case 14:
return t.Format("01-02 15:04")
case 15:
return t.Format("01-02 15:04:05")
case 34:
return t.Format("15:04")
case 35:
return t.Format("15:04:05")
}
return t.Format("2006-01-02 15:04:05")
}
// StrLd 相似度计算 ld compares two strings and returns the levenshtein distance between them. // StrLd 相似度计算 ld compares two strings and returns the levenshtein distance between them.
func StrLd(s, t string, ignoreCase bool) int { func StrLd(s, t string, ignoreCase bool) int {
if ignoreCase { if ignoreCase {