diff --git a/server/dbdata/group.go b/server/dbdata/group.go index ee66ac0..e08c286 100644 --- a/server/dbdata/group.go +++ b/server/dbdata/group.go @@ -74,6 +74,20 @@ func GetGroupNames() []string { return names } +func GetGroupNamesNormal() []string { + var datas []Group + err := FindWhere(&datas, 0, 0, "status=1") + if err != nil { + base.Error(err) + return nil + } + var names []string + for _, v := range datas { + names = append(names, v.Name) + } + return names +} + func GetGroupNamesIds() []GroupNameId { var datas []Group err := Find(&datas, 0, 0) diff --git a/server/handler/link_auth.go b/server/handler/link_auth.go index e7715fd..3473544 100644 --- a/server/handler/link_auth.go +++ b/server/handler/link_auth.go @@ -55,7 +55,7 @@ func LinkAuth(w http.ResponseWriter, r *http.Request) { if cr.Type == "init" { w.WriteHeader(http.StatusOK) - data := RequestData{Group: cr.GroupSelect, Groups: dbdata.GetGroupNames()} + data := RequestData{Group: cr.GroupSelect, Groups: dbdata.GetGroupNamesNormal()} tplRequest(tpl_request, w, data) return } @@ -83,7 +83,7 @@ func LinkAuth(w http.ResponseWriter, r *http.Request) { dbdata.UserActLogIns.Add(ua, userAgent) w.WriteHeader(http.StatusOK) - data := RequestData{Group: cr.GroupSelect, Groups: dbdata.GetGroupNames(), Error: "用户名或密码错误"} + data := RequestData{Group: cr.GroupSelect, Groups: dbdata.GetGroupNamesNormal(), Error: "用户名或密码错误"} tplRequest(tpl_request, w, data) return }