diff --git a/internal/api/office/work_moments.go b/internal/api/office/work_moments.go index ac7619dda..75eb9a789 100644 --- a/internal/api/office/work_moments.go +++ b/internal/api/office/work_moments.go @@ -180,7 +180,7 @@ func GetUserWorkMoments(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req) - ok, userID := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) + ok, opUserID := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) if !ok { log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) @@ -191,7 +191,8 @@ func GetUserWorkMoments(c *gin.Context) { PageNumber: req.PageNumber, ShowNumber: req.ShowNumber, } - reqPb.UserID = userID + reqPb.OpUserID = opUserID + reqPb.UserID = req.UserID etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfficeName) client := pbOffice.NewOfficeServiceClient(etcdConn) respPb, err := client.GetUserWorkMoments(context.Background(), &reqPb) diff --git a/pkg/base_info/work_moments_struct.go b/pkg/base_info/work_moments_struct.go index 22d38df37..314fa448e 100644 --- a/pkg/base_info/work_moments_struct.go +++ b/pkg/base_info/work_moments_struct.go @@ -43,6 +43,7 @@ type WorkMomentsUserCommonReq struct { type GetUserWorkMomentsReq struct { WorkMomentsUserCommonReq + UserID string `json:"userID"` } type GetUserWorkMomentsResp struct {