增加限制条件

This commit is contained in:
hoteas 2022-05-07 11:02:12 +08:00
parent 9ba182d65c
commit 918b88332b
5 changed files with 22 additions and 2 deletions

View File

@ -64,6 +64,7 @@ var ColumnNameType = []ColumnShow{
{"idcard", false, true, true, false, "", false}, {"idcard", false, true, true, false, "", false},
{"id", true, false, true, false, "", true}, {"id", true, false, true, false, "", true},
{"parent_id", true, true, true, false, "", true}, {"parent_id", true, true, true, false, "", true},
{"amount", true, true, true, false, "money", true},
{"content", false, false, false, false, "textArea", false}, {"content", false, false, false, false, "textArea", false},
{"info", false, true, true, false, "textArea", false}, {"info", false, true, true, false, "textArea", false},
//"sn"{true,true,true,""}, //"sn"{true,true,true,""},

View File

@ -786,11 +786,16 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
v.GetString("link") + "." + v.GetString("value") + " AS " + v.GetString("link") + "." + v.GetString("value") + " AS " +
v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + "," 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 { if that.TableColumns[v.GetString("link")]["phone"] != nil {
reStr += table + "." + v.GetString("name") + "," + reStr += v.GetString("link") + ".phone AS " +
v.GetString("link") + ".phone AS " +
v.GetString("link") + "_" + v.GetString("name") + "_phone," v.GetString("link") + "_" + v.GetString("name") + "_phone,"
} }
leftJoin["[>]"+v.GetString("link")] = leftJoin["[>]"+v.GetString("link")] =
table + "." + v.GetString("name") + "=" + table + "." + v.GetString("name") + "=" +
v.GetString("link") + ".id" v.GetString("link") + ".id"

View File

@ -54,6 +54,7 @@ func auth(that *Context, phone, companyName, userName string) error {
return errors.New("找不到用户") return errors.New("找不到用户")
} }
company := that.Db.Get("company", "name,id", Map{"id": user.GetCeilInt("company_id")}) company := that.Db.Get("company", "name,id", Map{"id": user.GetCeilInt("company_id")})
if company == nil { if company == nil {
return errors.New("找不到企业") return errors.New("找不到企业")
} }

View File

@ -24,6 +24,17 @@ var UserCtr = Ctr{
return return
} }
if user.GetCeilInt("company_id") == 0 {
companyId := that.Db.Insert("company", Map{
"user_id": user["id"],
"create_time[#]": "now()",
"modify_time[#]": "now()",
"del_flag": 0,
})
user["company_id"] = companyId
that.Db.Update("user", Map{"company_id": companyId}, Map{"id": user.GetCeilInt("id")})
}
delete(user, "password") delete(user, "password")
company := that.Db.Get("company", "id,name", Map{"id": user.GetCeilInt("company_id")}) company := that.Db.Get("company", "id,name", Map{"id": user.GetCeilInt("company_id")})

View File

@ -39,6 +39,7 @@ var Wechath5 = Ctr{
userId := 0 userId := 0
defer func() { defer func() {
//有sn就关联业务员 //有sn就关联业务员
parentId := ObjToInt(that.Req.FormValue("parent_id")) parentId := ObjToInt(that.Req.FormValue("parent_id"))
if parentId == 0 { if parentId == 0 {
@ -83,6 +84,7 @@ var Wechath5 = Ctr{
if user == nil { if user == nil {
return return
} }
//用户都有企服人员关联 //用户都有企服人员关联
if user.GetCeilInt("salesman_id") != 0 { if user.GetCeilInt("salesman_id") != 0 {