From 201be38fd71ee487d887e686cf07773ec750a8de Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 26 十月 2023 17:56:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 controllers/location.go |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/controllers/location.go b/controllers/location.go
index 5785eb6..5bfec45 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -4,7 +4,6 @@
 	"errors"
 	"github.com/gin-gonic/gin"
 	"strconv"
-	"strings"
 	"wms/extend/code"
 	"wms/extend/util"
 	"wms/models"
@@ -68,7 +67,7 @@
 	if params.PageInfo.Check() {
 		search.SetPage(params.Page, params.PageSize)
 	}
-	list, total, err := search.SetKeyword(params.KeyWord).SetOrder("created_at desc").Find()
+	list, total, err := search.SetKeyword(params.KeyWord).SetJointName(params.JointName).SetOrder("created_at desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
 		return
@@ -115,13 +114,24 @@
 		util.ResponseFormat(c, code.RequestParamError, err)
 		return
 	}
-	index := strings.LastIndex(params.JointName, "/")
-	if index > 0 {
-		jn := params.JointName[:index]
-		oldName := params.JointName[index+1:]
-		if oldName != params.Name {
-			params.JointName = jn + "/" + params.Name
+	//index := strings.LastIndex(params.JointName, "/")
+	//if index > 0 {
+	//	jn := params.JointName[:index]
+	//	oldName := params.JointName[index+1:]
+	//	if oldName != params.Name {
+	//		params.JointName = jn + "/" + params.Name
+	//	}
+	//}
+	if params.ParentId != 0 {
+		//鏌ヨ涓婄骇鍚嶇О
+		first, err := models.NewLocationSearch().SetID(params.ParentId).First()
+		if err != nil {
+			util.ResponseFormat(c, code.RequestParamError, "鏌ヨ涓婄骇鍚嶇О澶辫触")
+			return
 		}
+		params.JointName = first.JointName + "/" + params.Name
+	} else {
+		params.JointName = params.Name
 	}
 	err := models.NewLocationSearch().Update(&params)
 	if err != nil {

--
Gitblit v1.8.0