From 7971365ab70a19853e874d01fc3451bc0b5ee8e9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 20:15:30 +0800
Subject: [PATCH] 当前使用的工艺编号置顶

---
 api/v1/process_model.go |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 64becd0..5e3710d 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"apsClient/model"
 	"apsClient/model/request"
 	"apsClient/pkg/contextx"
 	"apsClient/pkg/ecode"
@@ -24,22 +25,27 @@
 		return
 	}
 
-	list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
+	if params.Page == 1 {
+		params.PageSize--
+	}
+
+	list, total, err := service.GetProcessModelList(params.Page, params.PageSize, params.Number)
 	if err != nil {
 		ctx.Fail(ecode.DBErr)
 		return
 	}
 	oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
+	if params.Page == 1 {
+		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 {
-
 			processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
 			processModel.Number, processModel.ParamsMap = oldProcessModel.Number, oldProcessModel.ParamsMap
 		}
 	}
-
 	ctx.ResultList(list, total)
 }

--
Gitblit v1.8.0