fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming 2023-09-01 16:19:32 +08:00
commit 8bdd90c055
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/info/internal/logic/infologic.go
View File

@ -48,6 +48,7 @@ type ModuleQuery struct {
} }
func (mquery *ModuleQuery) EncodeQuery(field string) string { func (mquery *ModuleQuery) EncodeQuery(field string) string {
var qstr []byte = []byte("JSON_OBJECT(") var qstr []byte = []byte("JSON_OBJECT(")
for query := range mquery.ModuleQuery { for query := range mquery.ModuleQuery {
@ -98,12 +99,16 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
moduleName := mlist[1] moduleName := mlist[1]
cond = fmt.Sprintf("module = '%s' and %s", moduleName, cond) cond = fmt.Sprintf("module = '%s' and %s", moduleName, cond)
if len(mlist) == 2 {
mlist = append(mlist, "")
}
if mquery, ok := mquerys[mtable]; ok { if mquery, ok := mquerys[mtable]; ok {
mquery.ModuleQuery[strings.Join(mlist[2:], ",")] = struct{}{} mquery.ModuleQuery[strings.Join(mlist[2:], ",")] = struct{}{}
} else { } else {
mquery := &ModuleQuery{ mquery := &ModuleQuery{
TableName: tname, TableName: tname,
ModuleName: mtable, ModuleName: mtable + "." + moduleName,
ModuleQuery: map[string]struct{}{strings.Join(mlist[2:], ","): {}}} ModuleQuery: map[string]struct{}{strings.Join(mlist[2:], ","): {}}}
mquerys[mtable] = mquery mquerys[mtable] = mquery
} }
@ -139,7 +144,7 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r
var querydata map[string]any = make(map[string]any) var querydata map[string]any = make(map[string]any)
err = json.Unmarshal([]byte(info["querydata"].(string)), &querydata) err = json.Unmarshal([]byte(info["querydata"].(string)), &querydata)
if err != nil { if err != nil {
logx.Error(err) logx.Error(err, info)
return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error()) return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error())
} }