From cc94e1f7427fa598f3e3758650554e97ef957034 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期六, 28 十月 2023 16:53:32 +0800 Subject: [PATCH] 销售线索支持查看下属数据 --- middleware/user.go | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/middleware/user.go b/middleware/user.go index c6df3f9..8a1a2b7 100644 --- a/middleware/user.go +++ b/middleware/user.go @@ -10,6 +10,7 @@ "fmt" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "strings" "time" ) @@ -32,7 +33,18 @@ } } +var whiteList = map[string]struct{}{ //鐧藉悕鍗曞湴鍧�鍒楄〃 + "/api/code/getCodeList": {}, + "/api/data/getAllData": {}, + "/api/serviceCollectionPlan/add": {}, + "/api/bankAccount/list": {}, + "/api/paymentType/list": {}, +} + func CheckAuth(apiPath string, token string) bool { + if _, ok := whiteList[apiPath]; ok { + return true + } cli := user.NewUserServiceClient(userConn) ctx, cancel := context.WithTimeout(context.Background(), time.Second) defer cancel() @@ -48,11 +60,14 @@ return rsp.Result } -func SyncUserInfo() { +func SyncUserInfo(uuid []string) { cli := user.NewUserServiceClient(userConn) - var users []*user.User - + for _, id := range uuid { + users = append(users, &user.User{ + Uuid: id, + }) + } ctx, cancel := context.WithTimeout(context.Background(), time.Second) defer cancel() r, err := cli.SyncUser(ctx, &user.UserRequest{Users: users}) @@ -64,11 +79,12 @@ fmt.Printf("Synced: %v, Message: %s", r.List, r.Message) for _, member := range r.List { - err = model.NewUserSearch(nil).FirstOrCreate(model.User{ - UUID: member.Uuid, - Username: member.Username, - UserType: constvar.UserType(member.Usertype), - NickName: member.Nickname, + err = model.NewUserSearch(nil).Upsert(model.User{ + UUID: member.Uuid, + Username: member.Username, + UserType: constvar.UserType(member.Usertype), + NickName: member.Nickname, + SubUserIds: strings.Join(member.SubUserIds, ","), }) if err != nil { logx.Errorf("sync user error: %v", err.Error()) -- Gitblit v1.8.0