1
0
mirror of https://github.com/silenceper/wechat.git synced 2026-02-09 15:12:26 +08:00

企业微信-移除可省略的错误判断 (#734)

Co-authored-by: markwang <www.wang61@qq.com>
This commit is contained in:
markwang
2023-10-10 19:31:23 +08:00
committed by GitHub
parent da5067bcb2
commit 3f1c5e7637
25 changed files with 175 additions and 382 deletions

View File

@@ -80,10 +80,8 @@ func (r *Client) DepartmentCreate(req *DepartmentCreateRequest) (*DepartmentCrea
return nil, err
}
result := &DepartmentCreateResponse{}
if err = util.DecodeWithError(response, result, "DepartmentCreate"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "DepartmentCreate")
return result, err
}
// DepartmentSimpleList 获取子部门ID列表
@@ -101,10 +99,8 @@ func (r *Client) DepartmentSimpleList(departmentID int) ([]*DepartmentID, error)
return nil, err
}
result := &DepartmentSimpleListResponse{}
if err = util.DecodeWithError(response, result, "DepartmentSimpleList"); err != nil {
return nil, err
}
return result.DepartmentID, nil
err = util.DecodeWithError(response, result, "DepartmentSimpleList")
return result.DepartmentID, err
}
// DepartmentList 获取部门列表
@@ -122,9 +118,7 @@ func (r *Client) DepartmentList() ([]*Department, error) {
}
// 按照结构体解析返回值
result := &DepartmentListResponse{}
if err = util.DecodeWithError(response, result, "DepartmentList"); err != nil {
return nil, err
}
err = util.DecodeWithError(response, result, "DepartmentList")
// 返回数据
return result.Department, err
}
@@ -144,8 +138,6 @@ func (r *Client) DepartmentGet(departmentID int) (*Department, error) {
return nil, err
}
result := &DepartmentGetResponse{}
if err = util.DecodeWithError(response, result, "DepartmentGet"); err != nil {
return nil, err
}
return &result.Department, nil
err = util.DecodeWithError(response, result, "DepartmentGet")
return &result.Department, err
}

View File

@@ -41,10 +41,8 @@ func (r *Client) GetPermList() (*GetPermListResponse, error) {
return nil, err
}
result := &GetPermListResponse{}
if err = util.DecodeWithError(response, result, "GetPermList"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "GetPermList")
return result, err
}
// GetLinkedCorpUserRequest 获取互联企业成员详细信息请求
@@ -111,10 +109,8 @@ func (r *Client) GetLinkedCorpUser(req *GetLinkedCorpUserRequest) (*GetLinkedCor
return nil, err
}
result := &GetLinkedCorpUserResponse{}
if err = util.DecodeWithError(response, result, "GetLinkedCorpUser"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "GetLinkedCorpUser")
return result, err
}
// LinkedCorpSimpleListRequest 获取互联企业部门成员请求
@@ -151,10 +147,8 @@ func (r *Client) LinkedCorpSimpleList(req *LinkedCorpSimpleListRequest) (*Linked
return nil, err
}
result := &LinkedCorpSimpleListResponse{}
if err = util.DecodeWithError(response, result, "LinkedCorpSimpleList"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "LinkedCorpSimpleList")
return result, err
}
// LinkedCorpUserListRequest 获取互联企业部门成员详情请求
@@ -183,10 +177,8 @@ func (r *Client) LinkedCorpUserList(req *LinkedCorpUserListRequest) (*LinkedCorp
return nil, err
}
result := &LinkedCorpUserListResponse{}
if err = util.DecodeWithError(response, result, "LinkedCorpUserList"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "LinkedCorpUserList")
return result, err
}
// LinkedCorpDepartmentListRequest 获取互联企业部门列表请求
@@ -223,8 +215,6 @@ func (r *Client) LinkedCorpDepartmentList(req *LinkedCorpDepartmentListRequest)
return nil, err
}
result := &LinkedCorpDepartmentListResponse{}
if err = util.DecodeWithError(response, result, "LinkedCorpDepartmentList"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "LinkedCorpDepartmentList")
return result, err
}

View File

@@ -51,10 +51,8 @@ func (r *Client) CreateTag(req *CreateTagRequest) (*CreateTagResponse, error) {
return nil, err
}
result := &CreateTagResponse{}
if err = util.DecodeWithError(response, result, "CreateTag"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "CreateTag")
return result, err
}
type (
@@ -129,10 +127,8 @@ func (r *Client) GetTag(tagID int) (*GetTagResponse, error) {
return nil, err
}
result := &GetTagResponse{}
if err = util.DecodeWithError(response, result, "GetTag"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "GetTag")
return result, err
}
type (
@@ -165,10 +161,8 @@ func (r *Client) AddTagUsers(req *AddTagUsersRequest) (*AddTagUsersResponse, err
return nil, err
}
result := &AddTagUsersResponse{}
if err = util.DecodeWithError(response, result, "AddTagUsers"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "AddTagUsers")
return result, err
}
type (
@@ -201,10 +195,8 @@ func (r *Client) DelTagUsers(req *DelTagUsersRequest) (*DelTagUsersResponse, err
return nil, err
}
result := &DelTagUsersResponse{}
if err = util.DecodeWithError(response, result, "DelTagUsers"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "DelTagUsers")
return result, err
}
type (
@@ -235,8 +227,6 @@ func (r *Client) ListTag() (*ListTagResponse, error) {
return nil, err
}
result := &ListTagResponse{}
if err = util.DecodeWithError(response, result, "ListTag"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "ListTag")
return result, err
}

View File

@@ -61,10 +61,7 @@ func (r *Client) UserSimpleList(departmentID int) ([]*UserList, error) {
}
result := &UserSimpleListResponse{}
err = util.DecodeWithError(response, result, "UserSimpleList")
if err != nil {
return nil, err
}
return result.UserList, nil
return result.UserList, err
}
type (
@@ -153,10 +150,8 @@ func (r *Client) UserCreate(req *UserCreateRequest) (*UserCreateResponse, error)
return nil, err
}
result := &UserCreateResponse{}
if err = util.DecodeWithError(response, result, "UserCreate"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "UserCreate")
return result, err
}
// UserGetResponse 获取部门成员响应
@@ -245,10 +240,7 @@ func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
}
result := &UserGetResponse{}
err = util.DecodeWithError(response, result, "UserGet")
if err != nil {
return nil, err
}
return result, nil
return result, err
}
type (
@@ -279,10 +271,8 @@ func (r *Client) UserDelete(userID string) (*UserDeleteResponse, error) {
return nil, err
}
result := &UserDeleteResponse{}
if err = util.DecodeWithError(response, result, "UserDelete"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "UserDelete")
return result, err
}
// UserListIDRequest 获取成员ID列表请求
@@ -324,10 +314,8 @@ func (r *Client) UserListID(req *UserListIDRequest) (*UserListIDResponse, error)
return nil, err
}
result := &UserListIDResponse{}
if err = util.DecodeWithError(response, result, "UserListID"); err != nil {
return nil, err
}
return result, nil
err = util.DecodeWithError(response, result, "UserListID")
return result, err
}
type (
@@ -366,10 +354,8 @@ func (r *Client) ConvertToOpenID(userID string) (string, error) {
return "", err
}
result := &convertToOpenIDResponse{}
if err = util.DecodeWithError(response, result, "ConvertToOpenID"); err != nil {
return "", err
}
return result.OpenID, nil
err = util.DecodeWithError(response, result, "ConvertToOpenID")
return result.OpenID, err
}
type (
@@ -408,8 +394,6 @@ func (r *Client) ConvertToUserID(openID string) (string, error) {
return "", err
}
result := &convertToUserIDResponse{}
if err = util.DecodeWithError(response, result, "ConvertToUserID"); err != nil {
return "", err
}
return result.UserID, nil
err = util.DecodeWithError(response, result, "ConvertToUserID")
return result.UserID, err
}