|
...
|
...
|
@@ -70,7 +70,7 @@ func (serviceGateway *HttplibUserServiceGateway) GetUsers(companyId int64, orgId |
|
|
|
}
|
|
|
|
|
|
|
|
// GetCompany 获取公司信息
|
|
|
|
func (serviceGateway *HttplibUserServiceGateway) GetCompany(companyId int64) (map[string]interface{}, error) {
|
|
|
|
func (serviceGateway *HttplibUserServiceGateway) GetCompany(companyId int64) (*translator.CompanyDetail, error) {
|
|
|
|
companyIdStr := strconv.FormatInt(companyId, 10)
|
|
|
|
url := serviceGateway.baseURL + "/company/" + companyIdStr
|
|
|
|
request := serviceGateway.createRequest(url, "get")
|
|
...
|
...
|
@@ -84,15 +84,29 @@ func (serviceGateway *HttplibUserServiceGateway) GetCompany(companyId int64) (ma |
|
|
|
"param": options,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
response := make(map[string]interface{})
|
|
|
|
err2 := request.ToJSON(&response)
|
|
|
|
if err2 != nil {
|
|
|
|
return nil, err2
|
|
|
|
//response := make(map[string]interface{})
|
|
|
|
//err2 := request.ToJSON(&response)
|
|
|
|
//if err2 != nil {
|
|
|
|
// return nil, err2
|
|
|
|
//}
|
|
|
|
//
|
|
|
|
//data, err := serviceGateway.responseHandle(response)
|
|
|
|
//return data, err
|
|
|
|
byteResult, err := request.Bytes()
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("获取返回企业失败：%w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
data, err := serviceGateway.responseHandle(response)
|
|
|
|
return data, err
|
|
|
|
log.Logger.Debug("获取用户模块请求数据：返回企业。", map[string]interface{}{
|
|
|
|
"result": string(byteResult),
|
|
|
|
})
|
|
|
|
var result GatewayResponse
|
|
|
|
err = json.Unmarshal(byteResult, &result)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("解析返回企业：%w", err)
|
|
|
|
}
|
|
|
|
var data translator.CompanyDetail
|
|
|
|
err = serviceGateway.getResponseData(result, &data)
|
|
|
|
return &data, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetDepartment 获取部门信息
|
|
...
|
...
|
@@ -116,23 +130,37 @@ func (serviceGateway *HttplibUserServiceGateway) GetDepartment(companyId int64, |
|
|
|
}
|
|
|
|
|
|
|
|
// GetOrganization 获取组织信息
|
|
|
|
func (serviceGateway *HttplibUserServiceGateway) GetOrganization(companyId int64, organizationId int64) (map[string]interface{}, error) {
|
|
|
|
func (serviceGateway *HttplibUserServiceGateway) GetOrganization(companyId int64, organizationId int64) (*translator.OrganizationDetail, error) {
|
|
|
|
organizationIdStr := strconv.FormatInt(organizationId, 10)
|
|
|
|
url := serviceGateway.baseURL + "/org/" + organizationIdStr
|
|
|
|
request := serviceGateway.createRequest(url, "get")
|
|
|
|
options := make(map[string]interface{})
|
|
|
|
options["orgId"] = organizationId
|
|
|
|
_, err1 := request.JSONBody(options)
|
|
|
|
if err1 != nil {
|
|
|
|
return nil, err1
|
|
|
|
}
|
|
|
|
response := make(map[string]interface{})
|
|
|
|
err2 := request.ToJSON(&response)
|
|
|
|
if err2 != nil {
|
|
|
|
return nil, err2
|
|
|
|
//response := make(map[string]interface{})
|
|
|
|
//err2 := request.ToJSON(&response)
|
|
|
|
//if err2 != nil {
|
|
|
|
// return nil, err2
|
|
|
|
//}
|
|
|
|
//data, err := serviceGateway.responseHandle(response)
|
|
|
|
//return data, err
|
|
|
|
byteResult, err := request.Bytes()
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("获取返回组织失败：%w", err)
|
|
|
|
}
|
|
|
|
data, err := serviceGateway.responseHandle(response)
|
|
|
|
return data, err
|
|
|
|
log.Logger.Debug("获取用户模块请求数据：返回组织。", map[string]interface{}{
|
|
|
|
"result": string(byteResult),
|
|
|
|
})
|
|
|
|
var result GatewayResponse
|
|
|
|
err = json.Unmarshal(byteResult, &result)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("解析返回组织：%w", err)
|
|
|
|
}
|
|
|
|
var data translator.OrganizationDetail
|
|
|
|
err = serviceGateway.getResponseData(result, &data)
|
|
|
|
return &data, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// UserInMenu 判断用户是否具有模块权限
|
...
|
...
|
|
