发布v2.11.5版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

server/internal/library/hgorm/dao.go

@@ -14,7 +14,6 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gstr"
 	"hotgo/utility/convert"
-	"hotgo/utility/tree"
 )
 
 type daoInstance interface {
@@ -117,6 +116,23 @@ func GetPkField(ctx context.Context, dao daoInstance) (string, error) {
 	return "", gerror.New("no primary key")
 }
 
+// GetFieldsToSlice 获取dao实例中的所有字段
+func GetFieldsToSlice(ctx context.Context, dao daoInstance) ([]string, error) {
+	fields, err := dao.Ctx(ctx).TableFields(dao.Table())
+	if err != nil {
+		return nil, err
+	}
+	if len(fields) == 0 {
+		return nil, gerror.New("field not found")
+	}
+
+	var keys []string
+	for _, field := range fields {
+		keys = append(keys, field.Name)
+	}
+	return keys, nil
+}
+
 // IsUnique 是否唯一
 func IsUnique(ctx context.Context, dao daoInstance, where g.Map, message string, pkId ...interface{}) error {
 	if len(where) == 0 {
@@ -148,40 +164,3 @@ func IsUnique(ctx context.Context, dao daoInstance, where g.Map, message string,
 	}
 	return nil
 }
-
-// GenSubTree 生成下级关系树
-func GenSubTree(ctx context.Context, dao daoInstance, oldPid int64) (newPid int64, newLevel int, subTree string, err error) {
-	// 顶级树
-	if oldPid <= 0 {
-		return 0, 1, "", nil
-	}
-
-	field, err := GetPkField(ctx, dao)
-	if err != nil {
-		return 0, 0, "", err
-	}
-
-	models, err := dao.Ctx(ctx).Where(field, oldPid).One()
-	if err != nil {
-		return 0, 0, "", err
-	}
-
-	if models.IsEmpty() {
-		return 0, 0, "", gerror.New("上级信息不存在")
-	}
-
-	level, ok := models["level"]
-	if !ok {
-		return 0, 0, "", gerror.New("表中必须包含`level`字段")
-	}
-
-	supTree, ok := models["tree"]
-	if !ok {
-		return 0, 0, "", gerror.New("表中必须包含`tree`字段")
-	}
-
-	newPid = oldPid
-	newLevel = level.Int() + 1
-	subTree = tree.GenLabel(supTree.String(), oldPid)
-	return
-}

server/internal/library/hgorm/dao_tree.go

@@ -0,0 +1,146 @@
+// Package hgorm
+// @Link  https://github.com/bufanyun/hotgo
+// @Copyright  Copyright (c) 2023 HotGo CLI
+// @Author  Ms <133814250@qq.com>
+// @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
+package hgorm
+
+import (
+	"context"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"hotgo/internal/model"
+	"hotgo/utility/tree"
+	"hotgo/utility/validate"
+)
+
+// GenSubTree 生成下级关系树
+func GenSubTree(ctx context.Context, dao daoInstance, oldPid int64) (newPid int64, newLevel int, subTree string, err error) {
+	if err = CheckTreeTable(ctx, dao); err != nil {
+		return
+	}
+
+	if oldPid <= 0 {
+		return 0, 1, "", nil
+	}
+
+	var models *model.DefaultTree
+	if err = dao.Ctx(ctx).WherePri(oldPid).Scan(&models); err != nil {
+		return 0, 0, "", err
+	}
+
+	if models == nil {
+		return 0, 0, "", gerror.New("上级信息不存在")
+	}
+
+	newPid = oldPid
+	newLevel = models.Level + 1
+	subTree = tree.GenLabel(models.Tree, oldPid)
+	return
+}
+
+// CheckTreeTable 检查树表
+func CheckTreeTable(ctx context.Context, dao daoInstance) (err error) {
+	fields, err := GetFieldsToSlice(ctx, dao)
+	if err != nil {
+		return err
+	}
+
+	if !validate.InSlice(fields, "pid") {
+		return gerror.New("树表必须包含`pid`字段")
+	}
+
+	if !validate.InSlice(fields, "level") {
+		return gerror.New("树表必须包含`level`字段")
+	}
+
+	if !validate.InSlice(fields, "tree") {
+		return gerror.New("树表必须包含`tree`字段")
+	}
+	return
+}
+
+// AutoUpdateTree 自动更新关系树
+func AutoUpdateTree(ctx context.Context, dao daoInstance, id, pid int64) (newPid int64, newLevel int, newTree string, err error) {
+	if err = CheckTreeTable(ctx, dao); err != nil {
+		return
+	}
+
+	if pid <= 0 {
+		newPid = 0
+		newLevel = 1
+		newTree = ""
+	} else {
+		var pd *model.DefaultTree
+		if err = dao.Ctx(ctx).WherePri(pid).Scan(&pd); err != nil {
+			return 0, 0, "", err
+		}
+
+		if pd == nil {
+			return 0, 0, "", gerror.New("未查询到树表上级信息，请检查！")
+		}
+
+		if id > 0 && validate.InSlice(tree.GetIds(pd.Tree), id) {
+			return 0, 0, "", gerror.New("上级不能设为自己当前的子级！")
+		}
+
+		newPid = pid
+		newLevel = pd.Level + 1
+		newTree = tree.GenLabel(pd.Tree, pid)
+	}
+
+	if id > 0 {
+		if pid == id {
+			return 0, 0, "", gerror.New("上级不能是自己！")
+		}
+
+		var models *model.DefaultTree
+		if err = dao.Ctx(ctx).WherePri(id).Scan(&models); err != nil {
+			return 0, 0, "", err
+		}
+
+		if models == nil {
+			return 0, 0, "", gerror.New("树表信息不存在，请检查！")
+		}
+
+		// 上级发生变化时，遍历修改其所有的下级关系树
+		if models.Pid != pid {
+			if err = updateChildrenTree(ctx, dao, models.Id, newLevel, newTree); err != nil {
+				return
+			}
+		}
+	}
+	return
+}
+
+// updateChildrenTree 更新下级关系树
+func updateChildrenTree(ctx context.Context, dao daoInstance, pid int64, pLevel int, pTree string) (err error) {
+	var list []*model.DefaultTree
+	if err = dao.Ctx(ctx).Where("pid", pid).Scan(&list); err != nil {
+		return
+	}
+
+	if len(list) == 0 {
+		return
+	}
+
+	newLevel := pLevel + 1
+	newTree := tree.GenLabel(pTree, pid)
+
+	var updateIds []int64
+	for _, v := range list {
+		updateIds = append(updateIds, v.Id)
+		if err = updateChildrenTree(ctx, dao, v.Id, newLevel, newTree); err != nil {
+			return
+		}
+	}
+
+	if len(updateIds) > 0 {
+		update := g.Map{
+			"level": newLevel,
+			"tree":  newTree,
+		}
+		_, err = dao.Ctx(ctx).WhereIn("id", updateIds).Data(update).Update()
+	}
+	return
+}

server/internal/library/hgorm/handler/sorter.go

@@ -104,7 +104,7 @@ func Sorter(in ISorter) func(m *gdb.Model) *gdb.Model {
 		// 不存在排序条件，默认使用主表主键做降序排序
 		var pk string
 		for name, field := range fields {
-			if gstr.ContainsI(field.Key, consts.GenCodesIndexPK) {
+			if gstr.ContainsI(gstr.ToUpper(field.Key), gstr.ToUpper(consts.GenCodesIndexPK)) {
 				pk = name
 				break
 			}