作者 陈志颖

合并分支 'dev' 到 'test'

test:测试删除用户



查看合并请求 !40
... ... @@ -121,7 +121,7 @@ func (repository *ColumnSettingRepository) FindOne(queryOptions map[string]inter
func (repository *ColumnSettingRepository) Find(queryOptions domain.ColumnSettingFindQuery) (int64, []*domain.ColumnSetting, error) {
tx := repository.transactionContext.PgTx
var columnSettingModels []*models.ColumnSetting
var columnSettingModels []models.ColumnSetting
columnSettings := make([]*domain.ColumnSetting, 0)
query := tx.Model(&columnSettingModels)
if len(queryOptions.Ids) > 0 {
... ... @@ -170,7 +170,7 @@ func (repository *ColumnSettingRepository) Find(queryOptions domain.ColumnSettin
return 0, columnSettings, err
} else {
for _, columnSettingModel := range columnSettingModels {
if columnSetting, errTrans := repository.transformPgModelToDomainModel(columnSettingModel); errTrans != nil {
if columnSetting, errTrans := repository.transformPgModelToDomainModel(&columnSettingModel); errTrans != nil {
return 0, columnSettings, errTrans
} else {
columnSettings = append(columnSettings, columnSetting)
... ...