diff --git a/internal/db/models/node_task_dao.go b/internal/db/models/node_task_dao.go index 73ddaa01..b5520d38 100644 --- a/internal/db/models/node_task_dao.go +++ b/internal/db/models/node_task_dao.go @@ -297,8 +297,8 @@ func (this *NodeTaskDAO) FindAllDoingNodeTasksWithClusterId(tx *dbs.Tx, role str Gt("nodeId", 0). Where("(isDone=0 OR (isDone=1 AND isOk=0))"). Desc("isDone"). - Asc(). Asc("nodeId"). + AscPk(). Slice(&result). FindAll() return diff --git a/internal/db/models/regions/region_province_dao.go b/internal/db/models/regions/region_province_dao.go index 0d5d9ea7..0a4c2200 100644 --- a/internal/db/models/regions/region_province_dao.go +++ b/internal/db/models/regions/region_province_dao.go @@ -122,7 +122,7 @@ func (this *RegionProvinceDAO) FindAllEnabledProvincesWithCountryId(tx *dbs.Tx, _, err = this.Query(tx). State(RegionProvinceStateEnabled). Attr("countryId", countryId). - Asc(). + AscPk(). Slice(&result). FindAll() return @@ -132,7 +132,7 @@ func (this *RegionProvinceDAO) FindAllEnabledProvincesWithCountryId(tx *dbs.Tx, func (this *RegionProvinceDAO) FindAllEnabledProvinces(tx *dbs.Tx) (result []*RegionProvince, err error) { _, err = this.Query(tx). State(RegionProvinceStateEnabled). - Asc(). + AscPk(). Slice(&result). FindAll() return diff --git a/internal/db/models/sys_event_dao.go b/internal/db/models/sys_event_dao.go index 40197d3a..c070b05b 100644 --- a/internal/db/models/sys_event_dao.go +++ b/internal/db/models/sys_event_dao.go @@ -51,7 +51,7 @@ func (this *SysEventDAO) CreateEvent(tx *dbs.Tx, event EventInterface) error { // 查找事件 func (this *SysEventDAO) FindEvents(tx *dbs.Tx, size int64) (result []*SysEvent, err error) { _, err = this.Query(tx). - Asc(). + AscPk(). Limit(size). Slice(&result). FindAll() diff --git a/internal/db/models/updating_server_list_dao.go b/internal/db/models/updating_server_list_dao.go index cfe8bb02..f3adfbf4 100644 --- a/internal/db/models/updating_server_list_dao.go +++ b/internal/db/models/updating_server_list_dao.go @@ -82,7 +82,7 @@ func (this *UpdatingServerListDAO) FindLists(tx *dbs.Tx, clusterIds []int64, las _, err = this.Query(tx). Attr("clusterId", clusterIds). // 即使clusterIds数量是变化的,这里也不需要使用Reuse(false),因为clusterIds通常数量有限 Gt("id", lastId). - Asc(). // 非常重要 + AscPk(). // 非常重要 Slice(&result). FindAll() return