From 57c1d91e82ec4085ccedf099063cd14e609a301f Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 15 十一月 2023 16:36:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/location.go | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index ff2d5c4..29ad83b 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -4,6 +4,7 @@
"errors"
"github.com/gin-gonic/gin"
"strconv"
+ "strings"
"wms/extend/code"
"wms/extend/util"
"wms/models"
@@ -97,6 +98,11 @@
if location.ParentId == 0 {
tree = append(tree, location)
} else {
+ if _, ok := m[location.ParentId]; !ok {
+ tree = append(tree, location)
+ continue
+ }
+ m[location.ParentId].Children = make([]*models.Location, 0)
m[location.ParentId].Children = append(m[location.ParentId].Children, location)
}
}
@@ -159,7 +165,7 @@
}
params.JointName = first.JointName + "/" + params.Name
} else {
- params.JointName = params.Name
+ params.JointName = strings.Split(params.JointName, "/")[0] + "/" + params.Name
}
err := models.NewLocationSearch().Update(¶ms)
if err != nil {
--
Gitblit v1.8.0