From e14993ce9429bdf16d1bfb913f72fce300be04fe Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 20:55:44 +0800
Subject: [PATCH] 当前使用的工艺编号置顶
---
api/v1/process_model.go | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index c19ceb3..7601bab 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -25,7 +25,9 @@
return
}
- if params.Page == 1 {
+ oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
+
+ if params.Page == 1 && !oldProcessModel.IsNew { //灏戞煡涓�涓�
params.PageSize--
}
@@ -34,23 +36,19 @@
ctx.Fail(ecode.DBErr)
return
}
- oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
- var isUpdate bool
+ if params.Page == 1 && !oldProcessModel.IsNew { //绮樺湪鍓嶉潰
+ 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)
}
--
Gitblit v1.8.0