From 94139ee1a04839135eb760b431f1212703d6cd86 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 10 十月 2023 10:57:03 +0800
Subject: [PATCH] Merge branch 'master' into feat-serf
---
service/process_model.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service/process_model.go b/service/process_model.go
index 728248d..bb42646 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -5,14 +5,14 @@
"apsClient/model"
)
-func GetProcessModelList(page, pageSize int) (list []*model.ProcessModel, total int64, err error) {
+func GetProcessModelList(offset, limit int, currentNumber string) (list []*model.ProcessModel, total int64, err error) {
device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
if err != nil {
return
}
list, total, err = model.NewProcessModelSearch().
- SetIsNew(true).SetOrder("id desc").
- SetPage(page, pageSize).SetProcedures(device.ProceduresArr).Find()
+ SetIsNew(true).SetOrder("id desc").SetCurrentNumber(currentNumber).
+ SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
return
}
--
Gitblit v1.8.0