合并分支 'dev' 到 'test'

test:测试删除用户



查看合并请求 !35

@@ -2,7 +2,6 @@ package repository
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"github.com/go-pg/pg"
 	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
 	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/domain"
 
 
 	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/models"
 	"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/infrastructure/pg/models"
@@ -125,7 +124,7 @@ func (repository *ColumnSettingRepository) Find(queryOptions map[string]interfac
 	columnSettings := make([]*domain.ColumnSetting, 0)
 	columnSettings := make([]*domain.ColumnSetting, 0)
 	query := tx.Model(&columnSettingModels)
 	query := tx.Model(&columnSettingModels)
 	if ids, ok := queryOptions["ids"]; ok && len(ids.([]int64)) != 0 {
 	if ids, ok := queryOptions["ids"]; ok && len(ids.([]int64)) != 0 {
-		query = query.Where("column_setting.uid IN (?)", pg.In(ids.([]int64)))
+		query = query.Where("column_setting.uid IN (?)", ids.([]int64))
 	}
 	}
 	if uid, ok := queryOptions["uid"]; ok {
 	if uid, ok := queryOptions["uid"]; ok {
 		query = query.Where("column_setting.uid = ?", uid)
 		query = query.Where("column_setting.uid = ?", uid)