From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
api/v1/process_model.go | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index c19ceb3..8a03909 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,33 +24,38 @@
if !ok {
return
}
-
- if params.Page == 1 {
- params.PageSize--
- }
-
- list, total, err := service.GetProcessModelList(params.Page, params.PageSize, params.Number)
+ oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
+ offset, limit, push := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
+ list, total, err := service.GetProcessModelList(offset, limit, params.Number)
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
- oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
- var isUpdate bool
+ if push { //绮樺湪鍓嶉潰
+ list = append([]*model.ProcessModel{oldProcessModel}, list...)
+ }
for _, processModel := range list {
if processModel.Procedure == oldProcessModel.Procedure && processModel.Product == oldProcessModel.Product {
processModel.IsUpdate = processModel.Number != params.Number
- }
- if processModel.IsUpdate {
- isUpdate = true
}
if processModel.IsUpdate {
processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
processModel.Number, processModel.ParamsMap = oldProcessModel.Number, oldProcessModel.ParamsMap
}
}
- if params.Page == 1 && !isUpdate {
- list = append([]*model.ProcessModel{oldProcessModel}, list...)
- }
ctx.ResultList(list, total)
}
+
+func GetOffsetAndLimit(current *model.ProcessModel, page, pageSize int) (offset, limit int, push bool) {
+ offset = (page - 1) * pageSize
+ if current.IsNew {
+ offset--
+ }
+ push = current.IsNew && page == 1
+ limit = pageSize
+ if push {
+ limit--
+ }
+ return offset, limit, push
+}
--
Gitblit v1.8.0