|
@@ -160,7 +160,7 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
|
|
|
CompanyId: detailedData.CompanyId,
|
|
CompanyId: detailedData.CompanyId,
|
|
|
DepartmentId: detailedData.DepartmentId,
|
|
DepartmentId: detailedData.DepartmentId,
|
|
|
ResourceType: detailedData.ResourceType,
|
|
ResourceType: detailedData.ResourceType,
|
|
|
- Number: detailedData.Number,
|
|
|
|
|
|
|
+ Number: detailedData.Number,
|
|
|
RuleId: detailedData.RuleId,
|
|
RuleId: detailedData.RuleId,
|
|
|
CreateTime: time.Now().Local(),
|
|
CreateTime: time.Now().Local(),
|
|
|
UserType: 0,
|
|
UserType: 0,
|
|
@@ -236,7 +236,7 @@ func (service *BalanceService) FindPreview(in *resourcesCenter.PreviewReq, url s
|
|
|
param := "personId=" + in.AccountId + "&infoId=" + in.InfoId + "&accountId=" + in.AccountId
|
|
param := "personId=" + in.AccountId + "&infoId=" + in.InfoId + "&accountId=" + in.AccountId
|
|
|
resp, status, _ := HttpPost_M(url+"/data/dedupByAcount", appheader, param, 20)
|
|
resp, status, _ := HttpPost_M(url+"/data/dedupByAcount", appheader, param, 20)
|
|
|
log.Println(resp, status)
|
|
log.Println(resp, status)
|
|
|
- if status != 200 && resp == nil {
|
|
|
|
|
|
|
+ if status != 200 && (resp == nil || len(resp) <= 0) {
|
|
|
return entity.ErrorCode, "请求去重接口出错", 0, 0
|
|
return entity.ErrorCode, "请求去重接口出错", 0, 0
|
|
|
}
|
|
}
|
|
|
data := resp["data"].(map[string]interface{})
|
|
data := resp["data"].(map[string]interface{})
|
