diff --git a/internal/cms_api/group/group.go b/internal/cms_api/group/group.go index c73ac9599..b53bc6bc1 100644 --- a/internal/cms_api/group/group.go +++ b/internal/cms_api/group/group.go @@ -38,6 +38,8 @@ func GetGroups(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } + reqPb.GroupID = req.GroupID + reqPb.GroupName = req.GroupName client := pbGroup.NewGroupClient(etcdConn) respPb, err := client.GetGroups(context.Background(), &reqPb) if err != nil { @@ -55,7 +57,7 @@ func GetGroups(c *gin.Context) { resp.GroupNums = int(respPb.GroupNum) resp.CurrentPage = int(respPb.Pagination.CurrentPage) resp.ShowNumber = int(respPb.Pagination.ShowNumber) - log.NewInfo("", utils.GetSelfFuncName(), "resp: ", resp) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp) c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp}) } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 1f3145340..72e5e4825 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1387,7 +1387,7 @@ func (s *groupServer) GetGroups(_ context.Context, req *pbGroup.GetGroupsReq) (* func (s *groupServer) GetGroupMembersCMS(_ context.Context, req *pbGroup.GetGroupMembersCMSReq) (*pbGroup.GetGroupMembersCMSResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "args:", req.String()) - resp := &pbGroup.GetGroupMembersCMSResp{} + resp := &pbGroup.GetGroupMembersCMSResp{CommonResp: &pbGroup.CommonResp{}} groupMembers, err := imdb.GetGroupMembersByGroupIdCMS(req.GroupID, req.UserName, req.Pagination.ShowNumber, req.Pagination.PageNumber) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMembersByGroupIdCMS Error", err.Error()) diff --git a/pkg/cms_api_struct/group.go b/pkg/cms_api_struct/group.go index 3427c8967..00769e80f 100644 --- a/pkg/cms_api_struct/group.go +++ b/pkg/cms_api_struct/group.go @@ -25,6 +25,8 @@ type GroupResponse struct { type GetGroupsRequest struct { RequestPagination OperationID string `json:"operationID" binding:"required"` + GroupID string `json:"groupID"` + GroupName string `json:"groupName"` } type GetGroupsResponse struct { @@ -36,7 +38,7 @@ type GetGroupsResponse struct { type GetGroupMembersRequest struct { GroupID string `form:"groupID" binding:"required"` UserName string `form:"userName"` - OperationID string `json:"operationID"` + OperationID string `json:"operationID" binding:"required"` RequestPagination }