Merge branch 'jhc' into dev
This commit is contained in:
commit
a974e0def3
@ -9,7 +9,7 @@ import (
|
||||
func (a *ApprovalProvider) GetName(ctx context.Context, in *approval.GetNameRequest) (*approval.GetNameResponse, error) {
|
||||
settings := make([]*model.FinancialFormSetting, 0)
|
||||
|
||||
err := model.DB.Model(&model.FinancialFormSetting{}).Where("settingType = ?", in.SettingType).Find(&settings).Error
|
||||
err := model.DB.Model(&model.FinancialFormSetting{}).Where("setting_type = ?", in.SettingType).Find(&settings).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -18,4 +18,4 @@ func (a *ApprovalProvider) GetName(ctx context.Context, in *approval.GetNameRequ
|
||||
response.Name = append(response.Name, settings[i].Name)
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user