From 79ad0a8d11afb75e6fa1292926eee3103b7c0062 Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Fri, 1 Sep 2023 16:10:32 +0800 Subject: [PATCH 1/2] fix --- server/info/internal/logic/infologic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/info/internal/logic/infologic.go b/server/info/internal/logic/infologic.go index 1b91f99b..9ac5323d 100644 --- a/server/info/internal/logic/infologic.go +++ b/server/info/internal/logic/infologic.go @@ -103,7 +103,7 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r } else { mquery := &ModuleQuery{ TableName: tname, - ModuleName: mtable, + ModuleName: mtable + "." + moduleName, ModuleQuery: map[string]struct{}{strings.Join(mlist[2:], ","): {}}} mquerys[mtable] = mquery } @@ -139,7 +139,7 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r var querydata map[string]any = make(map[string]any) err = json.Unmarshal([]byte(info["querydata"].(string)), &querydata) if err != nil { - logx.Error(err) + logx.Error(err, info) return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error()) } From 4d6ca1d2917c452933f573fbec1ca0708bed2cdf Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Fri, 1 Sep 2023 16:17:40 +0800 Subject: [PATCH 2/2] fix --- server/info/internal/logic/infologic.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/info/internal/logic/infologic.go b/server/info/internal/logic/infologic.go index 9ac5323d..bafecd32 100644 --- a/server/info/internal/logic/infologic.go +++ b/server/info/internal/logic/infologic.go @@ -48,6 +48,7 @@ type ModuleQuery struct { } func (mquery *ModuleQuery) EncodeQuery(field string) string { + var qstr []byte = []byte("JSON_OBJECT(") for query := range mquery.ModuleQuery { @@ -98,6 +99,10 @@ func (l *InfoLogic) Info(req *types.UserInfoRequest, userinfo *auth.UserInfo) (r moduleName := mlist[1] cond = fmt.Sprintf("module = '%s' and %s", moduleName, cond) + if len(mlist) == 2 { + mlist = append(mlist, "") + } + if mquery, ok := mquerys[mtable]; ok { mquery.ModuleQuery[strings.Join(mlist[2:], ",")] = struct{}{} } else {