fix: 问题修复

This commit is contained in:
meilin.huang
2024-05-16 17:26:32 +08:00
parent 89e12678eb
commit c4cb4234fd
46 changed files with 416 additions and 262 deletions

View File

@@ -5,10 +5,6 @@ import (
"mayfly-go/internal/machine/domain/repository"
"mayfly-go/pkg/base"
"mayfly-go/pkg/model"
"mayfly-go/pkg/utils/collx"
"strings"
"github.com/may-fly/cast"
)
type machineRepoImpl struct {
@@ -22,6 +18,7 @@ func newMachineRepo() repository.Machine {
// 分页获取机器信息列表
func (m *machineRepoImpl) GetMachineList(condition *entity.MachineQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
qd := model.NewCond().
Eq("id", condition.Id).
Eq("status", condition.Status).
Like("ip", condition.Ip).
Like("name", condition.Name).
@@ -29,11 +26,5 @@ func (m *machineRepoImpl) GetMachineList(condition *entity.MachineQuery, pagePar
Like("code", condition.Code).
Eq("protocol", condition.Protocol)
if condition.Ids != "" {
qd.In("id", collx.ArrayMap[string, uint64](strings.Split(condition.Ids, ","), func(val string) uint64 {
return cast.ToUint64(val)
}))
}
return m.PageByCondToAny(qd, pageParam, toEntity)
}