IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 14:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

organization

Browse Source
This commit is contained in:
skiffer-git
2022-04-18 17:25:54 +08:00
committed by Xinwei Xiong(cubxxw-openim)
parent 35d4ea7cce
commit 9d999c4067
8 changed files with 426 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/organization/organization.go
+2 -2
View File
@@ -398,8 +398,8 @@ func GetDepartmentMember(c *gin.Context) {
return
}
apiResp := api.GetDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, UserInDepartmentList: RpcResp.UserInDepartmentList}
apiResp.Data = jsonData.JsonDataList(RpcResp.UserInDepartmentList)
apiResp := api.GetDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, UserInDepartmentList: RpcResp.UserDepartmentMemberList}
apiResp.Data = jsonData.JsonDataList(RpcResp.UserDepartmentMemberList)
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp)
c.JSON(http.StatusOK, apiResp)
}
internal/rpc/organization/organization.go
+15 -8
View File
@@ -335,23 +335,30 @@ func (s *organizationServer) DeleteOrganizationUser(ctx context.Context, req *rp
func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.GetDepartmentMemberReq) (*rpc.GetDepartmentMemberResp, error) {
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String())
err, departmentMemberUserIDList := imdb.GetDepartmentMemberUserIDList(req.DepartmentID)
err, departmentMemberList := imdb.GetDepartmentMemberList(req.DepartmentID)
if err != nil {
errMsg := req.OperationID + " " + "GetDepartmentMemberUserIDList failed " + err.Error()
errMsg := req.OperationID + " " + "GetDepartmentMemberList failed " + err.Error()
log.Error(req.OperationID, errMsg, req.DepartmentID)
return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil
}
log.Debug(req.OperationID, "GetDepartmentMemberUserIDList ", departmentMemberUserIDList)
log.Debug(req.OperationID, "GetDepartmentMemberList ", departmentMemberList)
resp := rpc.GetDepartmentMemberResp{}
for _, v := range departmentMemberUserIDList {
r, err := s.GetUserInDepartmentByUserID(v, req.OperationID)
for _, v := range departmentMemberList {
err, organizationUser := imdb.GetOrganizationUser(v.UserID)
if err != nil {
log.Error(req.OperationID, "GetUserInDepartmentByUserID failed ", err.Error())
log.Error(req.OperationID, "GetOrganizationUser failed ", err.Error())
continue
}
log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", *r, "userID ", v)
resp.UserInDepartmentList = append(resp.UserInDepartmentList, r)
respOrganizationUser := &open_im_sdk.OrganizationUser{}
respDepartmentMember := &open_im_sdk.DepartmentMember{}
utils.CopyStructFields(respOrganizationUser, organizationUser)
utils.CopyStructFields(respDepartmentMember, &v)
userDepartmentMember := open_im_sdk.UserDepartmentMember{OrganizationUser: respOrganizationUser, DepartmentMember: respDepartmentMember}
log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", userDepartmentMember)
resp.UserDepartmentMemberList = append(resp.UserDepartmentMemberList, &userDepartmentMember)
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp)