|
...
|
...
|
@@ -149,7 +149,7 @@ func PositionEdit(param protocol.RequestPositionEdit) (*protocol.ResponsePositio |
|
|
|
if err != nil {
|
|
|
|
e := fmt.Errorf("positionRelationUpdate err:%s", err)
|
|
|
|
log.Error(e.Error())
|
|
|
|
return nil, protocol.NewErrWithMessage("1", e)
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
positioninfo = &protocol.ResponsePositionInfo{
|
|
...
|
...
|
@@ -217,12 +217,12 @@ func positionRelationUpdate(positionUpdate *models.Position, newparent *models.P |
|
|
|
}
|
|
|
|
//重建关系树
|
|
|
|
s := strings.TrimPrefix(positionSubset[i].Relation, oldRelation)
|
|
|
|
rs := strings.Split(s, "/")
|
|
|
|
if len(rs) >= 10 { //层级不能超过10级
|
|
|
|
positionSubset[i].Relation = strings.TrimSpace(fmt.Sprintf("%s%s", newRelation, s))
|
|
|
|
rs := strings.Split(positionSubset[i].Relation, "/")
|
|
|
|
if len(rs) > 10 { //层级不能超过10级
|
|
|
|
o.Rollback()
|
|
|
|
return protocol.NewErrWithMessage("10012")
|
|
|
|
}
|
|
|
|
positionSubset[i].Relation = strings.TrimSpace(fmt.Sprintf("%s%s", newRelation, s))
|
|
|
|
err = utils.ExecuteSQLWithOrmer(o, dataSql2, positionSubset[i].Relation, positionSubset[i].Id)
|
|
|
|
if err != nil {
|
|
|
|
o.Rollback()
|
...
|
...
|
|
