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

Co-authored-by: markwang <www.wang61@qq.com>

work/addresslist/department.go

@@ -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
 }

work/addresslist/linkedcorp.go

@@ -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
 }

work/addresslist/tag.go

@@ -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
 }

work/addresslist/user.go

@@ -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
 }

work/appchat/appchat.go

@@ -82,11 +82,9 @@ func (r *Client) Send(apiName string, request interface{}) (*SendResponse, error
 	}
 	// 按照结构体解析返回值
 	result := &SendResponse{}
-	if err = util.DecodeWithError(response, result, apiName); err != nil {
-		return nil, err
-	}
+	err = util.DecodeWithError(response, result, apiName)
 	// 返回数据
-	return result, nil
+	return result, err
 }
 
 // SendText 发送文本消息

work/checkin/checkin.go

@@ -62,8 +62,6 @@ func (r *Client) GetCheckinData(req *GetCheckinDataRequest) (*GetCheckinDataResp
 		return nil, err
 	}
 	result := &GetCheckinDataResponse{}
-	if err = util.DecodeWithError(response, result, "GetCheckinData"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetCheckinData")
+	return result, err
 }

work/externalcontact/callback.go

@@ -38,8 +38,6 @@ func (r *Client) GetCallbackMessage(encryptedMsg []byte) (msg EventCallbackMessa
 	if err != nil {
 		return
 	}
-	if err = xml.Unmarshal(bData, &msg); err != nil {
-		return
-	}
+	err = xml.Unmarshal(bData, &msg)
 	return
 }

work/externalcontact/contact_way.go

@@ -102,10 +102,8 @@ func (r *Client) AddContactWay(req *AddContactWayRequest) (*AddContactWayRespons
 		return nil, err
 	}
 	result := &AddContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "AddContactWay"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "AddContactWay")
+	return result, err
 }
 
 type (
@@ -153,10 +151,8 @@ func (r *Client) GetContactWay(req *GetContactWayRequest) (*GetContactWayRespons
 		return nil, err
 	}
 	result := &GetContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "GetContactWay"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetContactWay")
+	return result, err
 }
 
 type (
@@ -195,10 +191,8 @@ func (r *Client) UpdateContactWay(req *UpdateContactWayRequest) (*UpdateContactW
 		return nil, err
 	}
 	result := &UpdateContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "UpdateContactWay"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "UpdateContactWay")
+	return result, err
 }
 
 type (
@@ -236,10 +230,8 @@ func (r *Client) ListContactWay(req *ListContactWayRequest) (*ListContactWayResp
 		return nil, err
 	}
 	result := &ListContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "ListContactWay"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "ListContactWay")
+	return result, err
 }
 
 type (
@@ -268,8 +260,6 @@ func (r *Client) DelContactWay(req *DelContactWayRequest) (*DelContactWayRespons
 		return nil, err
 	}
 	result := &DelContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "DelContactWay"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "DelContactWay")
+	return result, err
 }

work/externalcontact/customer_acquisition.go

@@ -54,10 +54,8 @@ func (r *Client) ListLink(req *ListLinkRequest) (*ListLinkResponse, error) {
 		return nil, err
 	}
 	result := &ListLinkResponse{}
-	if err = util.DecodeWithError(response, result, "ListLink"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "ListLink")
+	return result, err
 }
 
 type (
@@ -102,10 +100,8 @@ func (r *Client) GetCustomerAcquisition(req *GetCustomerAcquisitionRequest) (*Ge
 		return nil, err
 	}
 	result := &GetCustomerAcquisitionResponse{}
-	if err = util.DecodeWithError(response, result, "GetCustomerAcquisition"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetCustomerAcquisition")
+	return result, err
 }
 
 type (
@@ -137,10 +133,8 @@ func (r *Client) CreateCustomerAcquisitionLink(req *CreateCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &CreateCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink")
+	return result, err
 }
 
 type (
@@ -172,10 +166,8 @@ func (r *Client) UpdateCustomerAcquisitionLink(req *UpdateCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &UpdateCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink")
+	return result, err
 }
 
 type (
@@ -204,10 +196,8 @@ func (r *Client) DeleteCustomerAcquisitionLink(req *DeleteCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &DeleteCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink")
+	return result, err
 }
 
 type (
@@ -247,10 +237,8 @@ func (r *Client) GetCustomerInfoWithCustomerAcquisitionLink(req *GetCustomerInfo
 		return nil, err
 	}
 	result := &GetCustomerInfoWithCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink")
+	return result, err
 }
 
 type (
@@ -279,14 +267,12 @@ func (r *Client) CustomerAcquisitionQuota() (*CustomerAcquisitionQuotaResponse,
 		return nil, err
 	}
 	var response []byte
-	if response, err = util.HTTPGet((fmt.Sprintf(customerAcquisitionQuotaURL, accessToken))); err != nil {
+	if response, err = util.HTTPGet(fmt.Sprintf(customerAcquisitionQuotaURL, accessToken)); err != nil {
 		return nil, err
 	}
 	result := &CustomerAcquisitionQuotaResponse{}
-	if err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota")
+	return result, err
 }
 
 type (
@@ -319,8 +305,6 @@ func (r *Client) CustomerAcquisitionStatistic(req *CustomerAcquisitionStatisticR
 		return nil, err
 	}
 	result := &CustomerAcquisitionStatisticResponse{}
-	if err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic")
+	return result, err
 }

work/externalcontact/external_user.go

@@ -50,10 +50,7 @@ func (r *Client) GetExternalUserList(userID string) ([]string, error) {
 	}
 	var result ExternalUserListResponse
 	err = util.DecodeWithError(response, &result, "GetExternalUserList")
-	if err != nil {
-		return nil, err
-	}
-	return result.ExternalUserID, nil
+	return result.ExternalUserID, err
 }
 
 // ExternalUserDetailResponse 外部联系人详情响应
@@ -125,10 +122,7 @@ func (r *Client) GetExternalUserDetail(externalUserID string, nextCursor ...stri
 	}
 	result := &ExternalUserDetailResponse{}
 	err = util.DecodeWithError(response, result, "get_external_user_detail")
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
+	return result, err
 }
 
 // BatchGetExternalUserDetailsRequest 批量获取外部联系人详情请求
@@ -196,10 +190,7 @@ func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetails
 	}
 	var result ExternalUserDetailListResponse
 	err = util.DecodeWithError(response, &result, "BatchGetExternalUserDetails")
-	if err != nil {
-		return nil, err
-	}
-	return result.ExternalContactList, nil
+	return result.ExternalContactList, err
 }
 
 // UpdateUserRemarkRequest 修改客户备注信息请求体
@@ -265,10 +256,8 @@ func (r *Client) ListCustomerStrategy(req *ListCustomerStrategyRequest) (*ListCu
 		return nil, err
 	}
 	result := &ListCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "ListCustomerStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "ListCustomerStrategy")
+	return result, err
 }
 
 // GetCustomerStrategyRequest 获取规则组详情请求
@@ -332,10 +321,8 @@ func (r *Client) GetCustomerStrategy(req *GetCustomerStrategyRequest) (*GetCusto
 		return nil, err
 	}
 	result := &GetCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetCustomerStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetCustomerStrategy")
+	return result, err
 }
 
 // GetRangeCustomerStrategyRequest 获取规则组管理范围请求
@@ -374,10 +361,8 @@ func (r *Client) GetRangeCustomerStrategy(req *GetRangeCustomerStrategyRequest)
 		return nil, err
 	}
 	result := &GetRangeCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy")
+	return result, err
 }
 
 // CreateCustomerStrategyRequest 创建新的规则组请求
@@ -410,10 +395,8 @@ func (r *Client) CreateCustomerStrategy(req *CreateCustomerStrategyRequest) (*Cr
 		return nil, err
 	}
 	result := &CreateCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "CreateCustomerStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "CreateCustomerStrategy")
+	return result, err
 }
 
 // EditCustomerStrategyRequest 编辑规则组及其管理范围请求

work/externalcontact/follow_user.go

@@ -31,8 +31,5 @@ func (r *Client) GetFollowUserList() ([]string, error) {
 	}
 	var result followerUserResponse
 	err = util.DecodeWithError(response, &result, "GetFollowUserList")
-	if err != nil {
-		return nil, err
-	}
-	return result.FollowUser, nil
+	return result.FollowUser, err
 }

work/externalcontact/groupchat.go

@@ -44,10 +44,8 @@ func (r *Client) GetGroupChatList(req *GroupChatListRequest) (*GroupChatListResp
 		return nil, err
 	}
 	result := &GroupChatListResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupChatList"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetGroupChatList")
+	return result, err
 }
 
 type (
@@ -106,10 +104,8 @@ func (r *Client) GetGroupChatDetail(req *GroupChatDetailRequest) (*GroupChatDeta
 		return nil, err
 	}
 	result := &GroupChatDetailResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetGroupChatDetail")
+	return result, err
 }
 
 type (
@@ -137,8 +133,6 @@ func (r *Client) OpengIDToChatID(req *OpengIDToChatIDRequest) (*OpengIDToChatIDR
 		return nil, err
 	}
 	result := &OpengIDToChatIDResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetGroupChatDetail")
+	return result, err
 }

work/externalcontact/join_way.go

@@ -44,10 +44,8 @@ func (r *Client) AddJoinWay(req *AddJoinWayRequest) (*AddJoinWayResponse, error)
 		return nil, err
 	}
 	result := &AddJoinWayResponse{}
-	if err = util.DecodeWithError(response, result, "AddJoinWay"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "AddJoinWay")
+	return result, err
 }
 
 type (
@@ -91,10 +89,8 @@ func (r *Client) GetJoinWay(req *JoinWayConfigRequest) (*GetJoinWayResponse, err
 		return nil, err
 	}
 	result := &GetJoinWayResponse{}
-	if err = util.DecodeWithError(response, result, "GetJoinWay"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetJoinWay")
+	return result, err
 }
 
 // UpdateJoinWayRequest 更新群配置的请求参数

work/externalcontact/moment.go

@@ -112,10 +112,8 @@ func (r *Client) AddMomentTask(req *AddMomentTaskRequest) (*AddMomentTaskRespons
 		return nil, err
 	}
 	result := &AddMomentTaskResponse{}
-	if err = util.DecodeWithError(response, result, "AddMomentTask"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "AddMomentTask")
+	return result, err
 }
 
 // GetMomentTaskResultResponse 获取任务创建结果响应
@@ -161,10 +159,8 @@ func (r *Client) GetMomentTaskResult(jobID string) (*GetMomentTaskResultResponse
 		return nil, err
 	}
 	result := &GetMomentTaskResultResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentTaskResult"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetMomentTaskResult")
+	return result, err
 }
 
 // CancelMomentTaskRequest 停止发表企业朋友圈请求
@@ -264,10 +260,8 @@ func (r *Client) GetMomentList(req *GetMomentListRequest) (*GetMomentListRespons
 		return nil, err
 	}
 	result := &GetMomentListResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentList"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetMomentList")
+	return result, err
 }
 
 // GetMomentTaskRequest 获取客户朋友圈企业发表的列表请求
@@ -305,10 +299,8 @@ func (r *Client) GetMomentTask(req *GetMomentTaskRequest) (*GetMomentTaskRespons
 		return nil, err
 	}
 	result := &GetMomentTaskResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentTask"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetMomentTask")
+	return result, err
 }
 
 // GetMomentCustomerListRequest 获取客户朋友圈发表时选择的可见范围请求
@@ -347,10 +339,8 @@ func (r *Client) GetMomentCustomerList(req *GetMomentCustomerListRequest) (*GetM
 		return nil, err
 	}
 	result := &GetMomentCustomerListResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentCustomerList"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetMomentCustomerList")
+	return result, err
 }
 
 // GetMomentSendResultRequest 获取客户朋友圈发表后的可见客户列表请求
@@ -388,10 +378,8 @@ func (r *Client) GetMomentSendResult(req *GetMomentSendResultRequest) (*GetMomen
 		return nil, err
 	}
 	result := &GetMomentSendResultResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentSendResult"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetMomentSendResult")
+	return result, err
 }
 
 // GetMomentCommentsRequest 获取客户朋友圈的互动数据请求
@@ -436,10 +424,8 @@ func (r *Client) GetMomentComments(req *GetMomentCommentsRequest) (*GetMomentCom
 		return nil, err
 	}
 	result := &GetMomentCommentsResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentComments"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetMomentComments")
+	return result, err
 }
 
 // ListMomentStrategyRequest 获取规则组列表请求
@@ -475,10 +461,8 @@ func (r *Client) ListMomentStrategy(req *ListMomentStrategyRequest) (*ListMoment
 		return nil, err
 	}
 	result := &ListMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "ListMomentStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "ListMomentStrategy")
+	return result, err
 }
 
 // GetMomentStrategyRequest 获取规则组详情请求
@@ -524,10 +508,8 @@ func (r *Client) GetMomentStrategy(req *GetMomentStrategyRequest) (*GetMomentStr
 		return nil, err
 	}
 	result := &GetMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetMomentStrategy")
+	return result, err
 }
 
 // GetRangeMomentStrategyRequest 获取规则组管理范围请求
@@ -566,10 +548,8 @@ func (r *Client) GetRangeMomentStrategy(req *GetRangeMomentStrategyRequest) (*Ge
 		return nil, err
 	}
 	result := &GetRangeMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetRangeMomentStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetRangeMomentStrategy")
+	return result, err
 }
 
 // CreateMomentStrategyRequest 创建新的规则组请求
@@ -602,10 +582,8 @@ func (r *Client) CreateMomentStrategy(req *CreateMomentStrategyRequest) (*Create
 		return nil, err
 	}
 	result := &CreateMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "CreateMomentStrategy"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "CreateMomentStrategy")
+	return result, err
 }
 
 // EditMomentStrategyRequest 编辑规则组及其管理范围请求

work/externalcontact/msg.go

@@ -106,10 +106,8 @@ func (r *Client) AddMsgTemplate(req *AddMsgTemplateRequest) (*AddMsgTemplateResp
 		return nil, err
 	}
 	result := &AddMsgTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "AddMsgTemplate"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "AddMsgTemplate")
+	return result, err
 }
 
 // GetGroupMsgListV2Request 获取群发记录列表请求
@@ -155,10 +153,8 @@ func (r *Client) GetGroupMsgListV2(req *GetGroupMsgListV2Request) (*GetGroupMsgL
 		return nil, err
 	}
 	result := &GetGroupMsgListV2Response{}
-	if err = util.DecodeWithError(response, result, "GetGroupMsgListV2"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetGroupMsgListV2")
+	return result, err
 }
 
 // GetGroupMsgTaskRequest 获取群发成员发送任务列表请求
@@ -197,10 +193,8 @@ func (r *Client) GetGroupMsgTask(req *GetGroupMsgTaskRequest) (*GetGroupMsgTaskR
 		return nil, err
 	}
 	result := &GetGroupMsgTaskResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupMsgTask"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetGroupMsgTask")
+	return result, err
 }
 
 // GetGroupMsgSendResultRequest 获取企业群发成员执行结果请求
@@ -242,10 +236,8 @@ func (r *Client) GetGroupMsgSendResult(req *GetGroupMsgSendResultRequest) (*GetG
 		return nil, err
 	}
 	result := &GetGroupMsgSendResultResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupMsgSendResult"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetGroupMsgSendResult")
+	return result, err
 }
 
 // SendWelcomeMsgRequest 发送新客户欢迎语请求
@@ -275,10 +267,7 @@ func (r *Client) SendWelcomeMsg(req *SendWelcomeMsgRequest) error {
 		return err
 	}
 	result := &SendWelcomeMsgResponse{}
-	if err = util.DecodeWithError(response, result, "SendWelcomeMsg"); err != nil {
-		return err
-	}
-	return nil
+	return util.DecodeWithError(response, result, "SendWelcomeMsg")
 }
 
 // AddGroupWelcomeTemplateRequest 添加入群欢迎语素材请求
@@ -314,10 +303,8 @@ func (r *Client) AddGroupWelcomeTemplate(req *AddGroupWelcomeTemplateRequest) (*
 		return nil, err
 	}
 	result := &AddGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "AddGroupWelcomeTemplate"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "AddGroupWelcomeTemplate")
+	return result, err
 }
 
 // EditGroupWelcomeTemplateRequest 编辑入群欢迎语素材请求
@@ -352,10 +339,7 @@ func (r *Client) EditGroupWelcomeTemplate(req *EditGroupWelcomeTemplateRequest)
 		return err
 	}
 	result := &EditGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "EditGroupWelcomeTemplate"); err != nil {
-		return err
-	}
-	return nil
+	return util.DecodeWithError(response, result, "EditGroupWelcomeTemplate")
 }
 
 // GetGroupWelcomeTemplateRequest 获取入群欢迎语素材请求
@@ -389,10 +373,8 @@ func (r *Client) GetGroupWelcomeTemplate(req *GetGroupWelcomeTemplateRequest) (*
 		return nil, err
 	}
 	result := &GetGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupWelcomeTemplate"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetGroupWelcomeTemplate")
+	return result, err
 }
 
 // DelGroupWelcomeTemplateRequest 删除入群欢迎语素材请求
@@ -421,10 +403,7 @@ func (r *Client) DelGroupWelcomeTemplate(req *DelGroupWelcomeTemplateRequest) er
 		return err
 	}
 	result := &DelGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "DelGroupWelcomeTemplate"); err != nil {
-		return err
-	}
-	return nil
+	return util.DecodeWithError(response, result, "DelGroupWelcomeTemplate")
 }
 
 // RemindGroupMsgSendRequest 提醒成员群发请求

work/externalcontact/statistic.go

@@ -60,10 +60,7 @@ func (r *Client) GetUserBehaviorData(req *GetUserBehaviorRequest) ([]BehaviorDat
 	}
 	var result GetUserBehaviorResponse
 	err = util.DecodeWithError(response, &result, "GetUserBehaviorData")
-	if err != nil {
-		return nil, err
-	}
-	return result.BehaviorData, nil
+	return result.BehaviorData, err
 }
 
 type (
@@ -126,10 +123,7 @@ func (r *Client) GetGroupChatStat(req *GetGroupChatStatRequest) (*GetGroupChatSt
 	}
 	result := &GetGroupChatStatResponse{}
 	err = util.DecodeWithError(response, result, "GetGroupChatStat")
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
+	return result, err
 }
 
 type (
@@ -169,8 +163,5 @@ func (r *Client) GetGroupChatStatByDay(req *GetGroupChatStatByDayRequest) ([]Get
 	}
 	var result GetGroupChatStatByDayResponse
 	err = util.DecodeWithError(response, &result, "GetGroupChatStatByDay")
-	if err != nil {
-		return nil, err
-	}
-	return result.Items, nil
+	return result.Items, err
 }

work/externalcontact/tag.go

@@ -77,10 +77,7 @@ func (r *Client) GetCropTagList(req GetCropTagRequest) ([]TagGroup, error) {
 	}
 	var result GetCropTagListResponse
 	err = util.DecodeWithError(response, &result, "GetCropTagList")
-	if err != nil {
-		return nil, err
-	}
-	return result.TagGroup, nil
+	return result.TagGroup, err
 }
 
 // AddCropTagRequest 添加企业标签请求
@@ -123,10 +120,7 @@ func (r *Client) AddCropTag(req AddCropTagRequest) (*TagGroup, error) {
 	}
 	var result AddCropTagResponse
 	err = util.DecodeWithError(response, &result, "AddCropTag")
-	if err != nil {
-		return nil, err
-	}
-	return &result.TagGroup, nil
+	return &result.TagGroup, err
 }
 
 // EditCropTagRequest 编辑客户企业标签请求
@@ -256,10 +250,8 @@ func (r *Client) GetStrategyTagList(req *GetStrategyTagListRequest) (*GetStrateg
 		return nil, err
 	}
 	result := &GetStrategyTagListResponse{}
-	if err = util.DecodeWithError(response, result, "GetStrategyTagList"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetStrategyTagList")
+	return result, err
 }
 
 // AddStrategyTagRequest 为指定规则组创建企业客户标签请求
@@ -315,10 +307,8 @@ func (r *Client) AddStrategyTag(req *AddStrategyTagRequest) (*AddStrategyTagResp
 		return nil, err
 	}
 	result := &AddStrategyTagResponse{}
-	if err = util.DecodeWithError(response, result, "AddStrategyTag"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "AddStrategyTag")
+	return result, err
 }
 
 // EditStrategyTagRequest 编辑指定规则组下的企业客户标签请求

work/externalcontact/transfer.go

@@ -58,10 +58,8 @@ func (r *Client) TransferCustomer(req *TransferCustomerRequest) (*TransferCustom
 		return nil, err
 	}
 	result := &TransferCustomerResponse{}
-	if err = util.DecodeWithError(response, result, "TransferCustomer"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "TransferCustomer")
+	return result, err
 }
 
 // TransferResultRequest 查询客户接替状态请求
@@ -100,10 +98,8 @@ func (r *Client) TransferResult(req *TransferResultRequest) (*TransferResultResp
 		return nil, err
 	}
 	result := &TransferResultResponse{}
-	if err = util.DecodeWithError(response, result, "TransferResult"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "TransferResult")
+	return result, err
 }
 
 // GroupChatOnJobTransferRequest 分配在职成员的客户群请求
@@ -140,10 +136,8 @@ func (r *Client) GroupChatOnJobTransfer(req *GroupChatOnJobTransferRequest) (*Gr
 		return nil, err
 	}
 	result := &GroupChatOnJobTransferResponse{}
-	if err = util.DecodeWithError(response, result, "GroupChatOnJobTransfer"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GroupChatOnJobTransfer")
+	return result, err
 }
 
 // GetUnassignedListRequest 获取待分配的离职成员列表请求
@@ -182,10 +176,8 @@ func (r *Client) GetUnassignedList(req *GetUnassignedListRequest) (*GetUnassigne
 		return nil, err
 	}
 	result := &GetUnassignedListResponse{}
-	if err = util.DecodeWithError(response, result, "GetUnassignedList"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetUnassignedList")
+	return result, err
 }
 
 // ResignedTransferCustomerRequest 分配离职成员的客户请求
@@ -216,10 +208,8 @@ func (r *Client) ResignedTransferCustomer(req *ResignedTransferCustomerRequest)
 		return nil, err
 	}
 	result := &ResignedTransferCustomerResponse{}
-	if err = util.DecodeWithError(response, result, "ResignedTransferCustomer"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "ResignedTransferCustomer")
+	return result, err
 }
 
 // ResignedTransferResultRequest 查询离职客户接替状态请求
@@ -251,10 +241,8 @@ func (r *Client) ResignedTransferResult(req *ResignedTransferResultRequest) (*Re
 		return nil, err
 	}
 	result := &ResignedTransferResultResponse{}
-	if err = util.DecodeWithError(response, result, "ResignedTransferResult"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "ResignedTransferResult")
+	return result, err
 }
 
 // GroupChatTransferRequest 分配离职成员的客户群请求
@@ -284,8 +272,6 @@ func (r *Client) GroupChatTransfer(req *GroupChatTransferRequest) (*GroupChatTra
 		return nil, err
 	}
 	result := &GroupChatTransferResponse{}
-	if err = util.DecodeWithError(response, result, "GroupChatTransfer"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GroupChatTransfer")
+	return result, err
 }

work/invoice/invoice.go

@@ -86,10 +86,8 @@ func (r *Client) GetInvoiceInfo(req *GetInvoiceInfoRequest) (*GetInvoiceInfoResp
 		return nil, err
 	}
 	result := &GetInvoiceInfoResponse{}
-	if err = util.DecodeWithError(response, result, "GetInvoiceInfo"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetInvoiceInfo")
+	return result, err
 }
 
 // UpdateInvoiceStatusRequest 更新发票状态请求
@@ -184,8 +182,6 @@ func (r *Client) GetInvoiceInfoBatch(req *GetInvoiceInfoBatchRequest) (*GetInvoi
 		return nil, err
 	}
 	result := &GetInvoiceInfoBatchResponse{}
-	if err = util.DecodeWithError(response, result, "GetInvoiceInfoBatch"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetInvoiceInfoBatch")
+	return result, err
 }

work/kf/callback.go

@@ -92,8 +92,6 @@ func (r *Client) GetCallbackMessage(encryptedMsg []byte) (msg CallbackMessage, e
 	if err != nil {
 		return msg, NewSDKErr(40016)
 	}
-	if err = xml.Unmarshal(bData, &msg); err != nil {
-		return msg, err
-	}
+	err = xml.Unmarshal(bData, &msg)
 	return msg, err
 }

work/kf/statistic.go

@@ -59,10 +59,8 @@ func (r *Client) GetCorpStatistic(req *GetCorpStatisticRequest) (*GetCorpStatist
 		return nil, err
 	}
 	result := &GetCorpStatisticResponse{}
-	if err = util.DecodeWithError(response, result, "GetCorpStatistic"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetCorpStatistic")
+	return result, err
 }
 
 // GetServicerStatisticRequest 获取「客户数据统计」接待人员明细数据请求
@@ -120,8 +118,6 @@ func (r *Client) GetServicerStatistic(req *GetServicerStatisticRequest) (*GetSer
 		return nil, err
 	}
 	result := &GetServicerStatisticResponse{}
-	if err = util.DecodeWithError(response, result, "GetServicerStatistic"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetServicerStatistic")
+	return result, err
 }

work/material/media.go

@@ -52,10 +52,8 @@ func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
 		return nil, err
 	}
 	result := &UploadImgResponse{}
-	if err = util.DecodeWithError(response, result, "UploadImg"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "UploadImg")
+	return result, err
 }
 
 // UploadTempFile 上传临时素材
@@ -74,10 +72,8 @@ func (r *Client) UploadTempFile(filename string, mediaType string) (*UploadTempF
 		return nil, err
 	}
 	result := &UploadTempFileResponse{}
-	if err = util.DecodeWithError(response, result, "UploadTempFile"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "UploadTempFile")
+	return result, err
 }
 
 // UploadAttachment 上传附件资源
@@ -97,8 +93,6 @@ func (r *Client) UploadAttachment(filename string, mediaType string, attachmentT
 		return nil, err
 	}
 	result := &UploadAttachmentResponse{}
-	if err = util.DecodeWithError(response, result, "UploadAttachment"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "UploadAttachment")
+	return result, err
 }

work/message/message.go

@@ -99,11 +99,9 @@ func (r *Client) Send(apiName string, request interface{}) (*SendResponse, error
 	}
 	// 按照结构体解析返回值
 	result := &SendResponse{}
-	if err = util.DecodeWithError(response, result, apiName); err != nil {
-		return nil, err
-	}
+	err = util.DecodeWithError(response, result, apiName)
 	// 返回数据
-	return result, nil
+	return result, err
 }
 
 // SendText 发送文本消息

work/msgaudit/client_linux.go

@@ -149,10 +149,7 @@ func (s *Client) GetRawChatData(seq uint64, limit uint64, proxy string, passwd s
 
 	var data ChatDataResponse
 	err := json.Unmarshal(buf, &data)
-	if err != nil {
-		return ChatDataResponse{}, err
-	}
-	return data, nil
+	return data, err
 }
 
 // DecryptData 解析密文.企业微信自有解密内容

work/oauth/oauth.go

@@ -123,10 +123,8 @@ func (ctr *Oauth) GetUserInfo(code string) (*GetUserInfoResponse, error) {
 		return nil, err
 	}
 	result := &GetUserInfoResponse{}
-	if err = util.DecodeWithError(response, result, "GetUserInfo"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetUserInfo")
+	return result, err
 }
 
 // GetUserDetailRequest 获取访问用户敏感信息请求
@@ -162,8 +160,6 @@ func (ctr *Oauth) GetUserDetail(req *GetUserDetailRequest) (*GetUserDetailRespon
 		return nil, err
 	}
 	result := &GetUserDetailResponse{}
-	if err = util.DecodeWithError(response, result, "GetUserDetail"); err != nil {
-		return nil, err
-	}
-	return result, nil
+	err = util.DecodeWithError(response, result, "GetUserDetail")
+	return result, err
 }