版本预发布

server/internal/library/hgorm/dao.go

@@ -19,15 +19,6 @@ import (
 	"hotgo/utility/tree"
 )
 
-// GenJoinOnRelation 生成关联表关联条件
-func GenJoinOnRelation(masterTable, masterField, joinTable, alias, onField string) []string {
-	return []string{
-		joinTable,
-		alias,
-		fmt.Sprintf("`%s`.`%s` = `%s`.`%s`", alias, onField, masterTable, masterField),
-	}
-}
-
 type daoInstance interface {
 	Table() string
 	Ctx(ctx context.Context) *gdb.Model
@@ -40,6 +31,15 @@ type Join struct {
 	fields map[string]*gdb.TableField // 表字段列表
 }
 
+// GenJoinOnRelation 生成关联表关联条件
+func GenJoinOnRelation(masterTable, masterField, joinTable, alias, onField string) []string {
+	return []string{
+		joinTable,
+		alias,
+		fmt.Sprintf("`%s`.`%s` = `%s`.`%s`", alias, onField, masterTable, masterField),
+	}
+}
+
 // GenJoinSelect 生成关联表select
 // 这里会将实体中的字段驼峰转为下划线于数据库进行匹配，意味着数据库字段必须全部是小写字母+下划线的格式
 func GenJoinSelect(ctx context.Context, entity interface{}, masterDao interface{}, joins []*Join) (allFields string, err error) {