diff --git a/server/addons/hgexample/logic/sys/table.go b/server/addons/hgexample/logic/sys/table.go index 5b126b3..6ffbc23 100644 --- a/server/addons/hgexample/logic/sys/table.go +++ b/server/addons/hgexample/logic/sys/table.go @@ -105,18 +105,7 @@ func (s *sSysTable) List(ctx context.Context, in sysin.TableListInp) (list []*sy return } - ////关联表select - //fields, err := hgorm.GenJoinSelect(ctx, sysin.TableListModel{}, dao.AddonHgexampleTable, []*hgorm.Join{ - // {Dao: dao.AddonHgexampleTableCategory, Alias: "testCategory"}, - // //{Dao: dao.AddonHgexampleTableCategory, Alias: "testCategory"}, - //}) - - fields, err := hgorm.GenSelect(ctx, sysin.TableListModel{}, dao.AddonHgexampleTable) - if err != nil { - return - } - - if err = mod.Fields(fields).Page(in.Page, in.PerPage).OrderAsc(dao.AddonHgexampleTable.Columns().Sort).OrderDesc(dao.AddonHgexampleTable.Columns().Id).Scan(&list); err != nil { + if err = mod.Fields(sysin.TableListModel{}).Page(in.Page, in.PerPage).OrderAsc(dao.AddonHgexampleTable.Columns().Sort).OrderDesc(dao.AddonHgexampleTable.Columns().Id).Scan(&list); err != nil { err = gerror.Wrap(err, consts.ErrorORM) return } @@ -154,7 +143,7 @@ func (s *sSysTable) Export(ctx context.Context, in sysin.TableListInp) (err erro // Edit 修改/新增 func (s *sSysTable) Edit(ctx context.Context, in sysin.TableEditInp) (err error) { - if err = hgorm.IsUnique(ctx, dao.AddonHgexampleTable, g.Map{dao.AddonHgexampleTable.Columns().Qq: in.Qq}, "QQ号码已存在,请换一个", in.Id); err != nil { + if err = hgorm.IsUnique(ctx, &dao.AddonHgexampleTable, g.Map{dao.AddonHgexampleTable.Columns().Qq: in.Qq}, "QQ号码已存在,请换一个", in.Id); err != nil { return } diff --git a/server/internal/library/cache/file/file.go b/server/internal/library/cache/file/file.go index 6127c07..4c88d7f 100644 --- a/server/internal/library/cache/file/file.go +++ b/server/internal/library/cache/file/file.go @@ -71,15 +71,37 @@ func (c *AdapterFile) Get(ctx context.Context, key interface{}) (*gvar.Var, erro } func (c *AdapterFile) GetOrSet(ctx context.Context, key interface{}, value interface{}, duration time.Duration) (result *gvar.Var, err error) { - return nil, gerror.New("implement me") + result, err = c.Get(ctx, key) + if err != nil { + return nil, err + } + if result.IsNil() { + return gvar.New(value), c.Set(ctx, key, value, duration) + } + return } func (c *AdapterFile) GetOrSetFunc(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) { - return nil, gerror.New("implement me") + v, err := c.Get(ctx, key) + if err != nil { + return nil, err + } + if v.IsNil() { + value, err := f(ctx) + if err != nil { + return nil, err + } + if value == nil { + return nil, nil + } + return gvar.New(value), c.Set(ctx, key, value, duration) + } else { + return v, nil + } } func (c *AdapterFile) GetOrSetFuncLock(ctx context.Context, key interface{}, f gcache.Func, duration time.Duration) (result *gvar.Var, err error) { - return nil, gerror.New("implement me") + return c.GetOrSetFunc(ctx, key, f, duration) } func (c *AdapterFile) Contains(ctx context.Context, key interface{}) (bool, error) { diff --git a/server/internal/library/hggen/views/curd_generate_logic.go b/server/internal/library/hggen/views/curd_generate_logic.go index 359dbc6..2ba3b23 100644 --- a/server/internal/library/hggen/views/curd_generate_logic.go +++ b/server/internal/library/hggen/views/curd_generate_logic.go @@ -19,11 +19,11 @@ const ( LogicWhereComments = "\n\t// 查询%s\n" LogicWhereNoSupport = "\t// TODO 暂不支持生成[ %s ]查询方式,请自行补充此处代码!" LogicListSimpleSelect = "\tfields, err := hgorm.GenSelect(ctx, sysin.%sListModel{}, dao.%s)\n\tif err != nil {\n\t\treturn\n\t}" - LogicListJoinSelect = "\t//关联表select\n\tfields, err := hgorm.GenJoinSelect(ctx, %sin.%sListModel{}, dao.%s, []*hgorm.Join{\n%v\t})\n\n\tif err != nil {\n\t\terr = gerror.Wrap(err, \"获取%s关联字段失败,请稍后重试!\")\n\t\treturn\n\t}" + LogicListJoinSelect = "\t//关联表select\n\tfields, err := hgorm.GenJoinSelect(ctx, %sin.%sListModel{}, &dao.%s, []*hgorm.Join{\n%v\t})\n\n\tif err != nil {\n\t\terr = gerror.Wrap(err, \"获取%s关联字段失败,请稍后重试!\")\n\t\treturn\n\t}" LogicListJoinOnRelation = "\t// 关联表%s\n\tmod = mod.%s(hgorm.GenJoinOnRelation(\n\t\tdao.%s.Table(), dao.%s.Columns().%s, // 主表表名,关联字段\n\t\tdao.%s.Table(), \"%s\", dao.%s.Columns().%s, // 关联表表名,别名,关联字段\n\t)...)\n\n" LogicEditUpdate = "\tif _, err = s.Model(ctx%s).\n\t\t\tFields(%sin.%sUpdateFields{}).\n\t\t\tWherePri(in.%s).Data(in).Update(); err != nil {\n\t\t\terr = gerror.Wrap(err, \"修改%s失败,请稍后重试!\")\n\t\t}\n\t\treturn" LogicEditInsert = "\tif _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).\n\t\tFields(%sin.%sInsertFields{}).\n\t\tData(in).Insert(); err != nil {\n\t\terr = gerror.Wrap(err, \"新增%s失败,请稍后重试!\")\n\t}" - LogicEditUnique = "\t// 验证'%s'唯一\n\tif err = hgorm.IsUnique(ctx, dao.%s, g.Map{dao.%s.Columns().%s: in.%s}, \"%s已存在\", in.Id); err != nil {\n\t\treturn\n\t}\n" + LogicEditUnique = "\t// 验证'%s'唯一\n\tif err = hgorm.IsUnique(ctx, &dao.%s, g.Map{dao.%s.Columns().%s: in.%s}, \"%s已存在\", in.Id); err != nil {\n\t\treturn\n\t}\n" LogicSwitchUpdate = "g.Map{\n\t\tin.Key: in.Value,\n%s}" LogicStatusUpdate = "g.Map{\n\t\tdao.%s.Columns().Status: in.Status,\n%s}" ) @@ -133,7 +133,7 @@ func (l *gCurd) generateLogicListJoin(ctx context.Context, in *CurdPreviewInput) for _, join := range in.options.Join { if isEffectiveJoin(join) { - joinSelectRows = joinSelectRows + fmt.Sprintf("\t\t{Dao: dao.%s, Alias: \"%s\"},\n", join.DaoName, join.Alias) + joinSelectRows = joinSelectRows + fmt.Sprintf("\t\t{Dao: &dao.%s, Alias: \"%s\"},\n", join.DaoName, join.Alias) linkBuffer.WriteString(fmt.Sprintf(LogicListJoinOnRelation, join.Alias, consts.GenCodesJoinLinkMap[join.LinkMode], in.In.DaoName, in.In.DaoName, gstr.CaseCamel(join.MasterField), join.DaoName, join.Alias, join.DaoName, gstr.CaseCamel(join.Field))) } } @@ -143,11 +143,9 @@ func (l *gCurd) generateLogicListJoin(ctx context.Context, in *CurdPreviewInput) data["select"] = selectBuffer.String() data["fields"] = "fields" data["link"] = linkBuffer.String() - } else { data["fields"] = fmt.Sprintf("%sin.%sListModel{}", in.options.TemplateGroup, in.In.VarName) } - return data } @@ -165,7 +163,6 @@ func (l *gCurd) generateLogicListWhere(ctx context.Context, in *CurdPreviewInput } } } - return buffer.String() } diff --git a/server/internal/library/hgorm/dao.go b/server/internal/library/hgorm/dao.go index f1bce57..300f3c9 100644 --- a/server/internal/library/hgorm/dao.go +++ b/server/internal/library/hgorm/dao.go @@ -8,7 +8,6 @@ package hgorm // dao. import ( "context" - "errors" "fmt" "github.com/gogf/gf/v2/database/gdb" "github.com/gogf/gf/v2/errors/gerror" @@ -25,56 +24,41 @@ type daoInstance interface { // Join 关联表属性 type Join struct { - Dao interface{} // 关联表dao实例 + Dao daoInstance // 关联表dao实例 Alias string // 别名 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), - } + relation := fmt.Sprintf("`%s`.`%s` = `%s`.`%s`", alias, onField, masterTable, masterField) + return []string{joinTable, alias, relation} } // GenJoinSelect 生成关联表select // 这里会将实体中的字段驼峰转为下划线于数据库进行匹配,意味着数据库字段必须全部是小写字母+下划线的格式 -func GenJoinSelect(ctx context.Context, entity interface{}, masterDao interface{}, joins []*Join) (allFields string, err error) { +func GenJoinSelect(ctx context.Context, entity interface{}, dao daoInstance, joins []*Join) (allFields string, err error) { var tmpFields []string - - md, ok := masterDao.(daoInstance) - if !ok { - err = errors.New("masterDao unimplemented interface format.daoInstance") - return - } - if len(joins) == 0 { - err = errors.New("JoinFields joins len = 0") + err = gerror.New("JoinFields joins len = 0") return } for _, v := range joins { - jd, ok := v.Dao.(daoInstance) - if !ok { - err = errors.New("joins index unimplemented interface format.daoInstance") - return - } - v.fields, err = jd.Ctx(ctx).TableFields(jd.Table()) + v.fields, err = v.Dao.Ctx(ctx).TableFields(v.Dao.Table()) if err != nil { return } } - masterFields, err := md.Ctx(ctx).TableFields(md.Table()) + masterFields, err := dao.Ctx(ctx).TableFields(dao.Table()) if err != nil { return } entityFields, err := convert.GetEntityFieldTags(entity) if err != nil { - return "", err + return } if len(entityFields) == 0 { @@ -104,42 +88,7 @@ func GenJoinSelect(ctx context.Context, entity interface{}, masterDao interface{ // 主表 originalField := gstr.CaseSnakeFirstUpper(field) if _, ok := masterFields[originalField]; ok { - tmpFields = append(tmpFields, fmt.Sprintf("`%s`.`%s`", md.Table(), originalField)) - continue - } - } - return gstr.Implode(",", convert.UniqueSlice(tmpFields)), nil -} - -// GenSelect 生成select -// 这里会将实体中的字段驼峰转为下划线于数据库进行匹配,意味着数据库字段必须全部是小写字母+下划线的格式 -func GenSelect(ctx context.Context, entity interface{}, dao interface{}) (allFields string, err error) { - var tmpFields []string - - md, ok := dao.(daoInstance) - if !ok { - err = errors.New("dao unimplemented interface format.daoInstance") - return - } - - fields, err := md.Ctx(ctx).TableFields(md.Table()) - if err != nil { - return - } - - entityFields, err := convert.GetEntityFieldTags(entity) - if err != nil { - return "", err - } - - if len(entityFields) == 0 { - return "*", nil - } - - for _, field := range entityFields { - originalField := gstr.CaseSnakeFirstUpper(field) - if _, ok := fields[originalField]; ok { - tmpFields = append(tmpFields, fmt.Sprintf("`%s`", originalField)) + tmpFields = append(tmpFields, fmt.Sprintf("`%s`.`%s`", dao.Table(), originalField)) continue } } @@ -153,7 +102,7 @@ func GetPkField(ctx context.Context, dao daoInstance) (string, error) { return "", err } if len(fields) == 0 { - return "", errors.New("field not found") + return "", gerror.New("field not found") } for _, field := range fields { @@ -161,23 +110,18 @@ func GetPkField(ctx context.Context, dao daoInstance) (string, error) { return field.Name, nil } } - return "", errors.New("no primary key") + return "", gerror.New("no primary key") } // IsUnique 是否唯一 -func IsUnique(ctx context.Context, dao interface{}, where g.Map, message string, pkId ...interface{}) error { - d, ok := dao.(daoInstance) - if !ok { - return errors.New("IsUnique dao unimplemented interface format.daoInstance") - } - +func IsUnique(ctx context.Context, dao daoInstance, where g.Map, message string, pkId ...interface{}) error { if len(where) == 0 { - return errors.New("where condition cannot be empty") + return gerror.New("where condition cannot be empty") } - m := d.Ctx(ctx).Where(where) + m := dao.Ctx(ctx).Where(where) if len(pkId) > 0 { - field, err := GetPkField(ctx, d) + field, err := GetPkField(ctx, dao) if err != nil { return err } @@ -192,32 +136,28 @@ func IsUnique(ctx context.Context, dao interface{}, where g.Map, message string, if count > 0 { if message == "" { for k := range where { - message = fmt.Sprintf("in the table:%s, %v not uniqued", d.Table(), where[k]) + message = fmt.Sprintf("in the table:%s, %v not uniqued", dao.Table(), where[k]) break } } - return errors.New(message) + return gerror.New(message) } return nil } // GenSubTree 生成下级关系树 -func GenSubTree(ctx context.Context, dao interface{}, oldPid int64) (newPid int64, newLevel int, subTree string, err error) { +func GenSubTree(ctx context.Context, dao daoInstance, oldPid int64) (newPid int64, newLevel int, subTree string, err error) { // 顶级树 if oldPid <= 0 { return 0, 1, "", nil } - d, ok := dao.(daoInstance) - if !ok { - return 0, 0, "", errors.New("GenTree dao unimplemented interface format.daoInstance") - } - field, err := GetPkField(ctx, d) + field, err := GetPkField(ctx, dao) if err != nil { return 0, 0, "", err } - models, err := d.Ctx(ctx).Where(field, oldPid).One() + models, err := dao.Ctx(ctx).Where(field, oldPid).One() if err != nil { return 0, 0, "", err } diff --git a/server/internal/logic/admin/credits_log.go b/server/internal/logic/admin/credits_log.go index be6dd67..1cfe169 100644 --- a/server/internal/logic/admin/credits_log.go +++ b/server/internal/logic/admin/credits_log.go @@ -13,7 +13,6 @@ import ( "github.com/gogf/gf/v2/errors/gerror" "hotgo/internal/consts" "hotgo/internal/dao" - "hotgo/internal/library/hgorm" "hotgo/internal/library/hgorm/handler" "hotgo/internal/model/entity" "hotgo/internal/model/input/adminin" @@ -218,12 +217,7 @@ func (s *sAdminCreditsLog) List(ctx context.Context, in adminin.CreditsLogListIn return } - fields, err := hgorm.GenSelect(ctx, adminin.CreditsLogListModel{}, dao.AdminCreditsLog) - if err != nil { - return - } - - err = mod.Fields(fields).Page(in.Page, in.PerPage).OrderDesc(dao.AdminCreditsLog.Columns().Id).Scan(&list) + err = mod.Fields(adminin.CreditsLogListModel{}).Page(in.Page, in.PerPage).OrderDesc(dao.AdminCreditsLog.Columns().Id).Scan(&list) return } diff --git a/server/internal/logic/admin/dept.go b/server/internal/logic/admin/dept.go index a663212..0c78f3d 100644 --- a/server/internal/logic/admin/dept.go +++ b/server/internal/logic/admin/dept.go @@ -58,11 +58,11 @@ func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err // Edit 修改/新增 func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err error) { - if err = hgorm.IsUnique(ctx, dao.AdminDept, g.Map{dao.AdminDept.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil { + if err = hgorm.IsUnique(ctx, &dao.AdminDept, g.Map{dao.AdminDept.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil { return } - if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.AdminDept, in.Pid); err != nil { + if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, &dao.AdminDept, in.Pid); err != nil { return } diff --git a/server/internal/logic/admin/member.go b/server/internal/logic/admin/member.go index a18c346..ca403ef 100644 --- a/server/internal/logic/admin/member.go +++ b/server/internal/logic/admin/member.go @@ -380,7 +380,7 @@ func (s *sAdminMember) VerifyUnique(ctx context.Context, in adminin.VerifyUnique err = gerror.Newf("字段 [ %v ] 未配置唯一属性验证", k) return } - if err = hgorm.IsUnique(ctx, dao.AdminMember, g.Map{k: v}, message, in.Id); err != nil { + if err = hgorm.IsUnique(ctx, &dao.AdminMember, g.Map{k: v}, message, in.Id); err != nil { return } } @@ -599,7 +599,6 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list list[i].PostIds = append(list[i].PostIds, v.Int64()) } } - return } diff --git a/server/internal/logic/admin/order.go b/server/internal/logic/admin/order.go index 5b5262d..cfb95dd 100644 --- a/server/internal/logic/admin/order.go +++ b/server/internal/logic/admin/order.go @@ -294,8 +294,8 @@ func (s *sAdminOrder) List(ctx context.Context, in adminin.OrderListInp) (list [ } //关联表select - fields, err := hgorm.GenJoinSelect(ctx, adminin.OrderListModel{}, dao.AdminOrder, []*hgorm.Join{ - {Dao: dao.PayLog, Alias: "payLog"}, + fields, err := hgorm.GenJoinSelect(ctx, adminin.OrderListModel{}, &dao.AdminOrder, []*hgorm.Join{ + {Dao: &dao.PayLog, Alias: "payLog"}, }) if err != nil { diff --git a/server/internal/logic/admin/role.go b/server/internal/logic/admin/role.go index 5221eb3..ced6b5c 100644 --- a/server/internal/logic/admin/role.go +++ b/server/internal/logic/admin/role.go @@ -171,15 +171,15 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePer } func (s *sAdminRole) Edit(ctx context.Context, in adminin.RoleEditInp) (err error) { - if err = hgorm.IsUnique(ctx, dao.AdminRole, g.Map{dao.AdminRole.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil { + if err = hgorm.IsUnique(ctx, &dao.AdminRole, g.Map{dao.AdminRole.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil { return } - if err = hgorm.IsUnique(ctx, dao.AdminRole, g.Map{dao.AdminRole.Columns().Key: in.Key}, "编码已存在", in.Id); err != nil { + if err = hgorm.IsUnique(ctx, &dao.AdminRole, g.Map{dao.AdminRole.Columns().Key: in.Key}, "编码已存在", in.Id); err != nil { return } - if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.AdminRole, in.Pid); err != nil { + if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, &dao.AdminRole, in.Pid); err != nil { return } diff --git a/server/internal/logic/pay/refund.go b/server/internal/logic/pay/refund.go index 8e988c1..4436ae5 100644 --- a/server/internal/logic/pay/refund.go +++ b/server/internal/logic/pay/refund.go @@ -16,7 +16,6 @@ import ( "github.com/gogf/gf/v2/net/ghttp" "hotgo/internal/consts" "hotgo/internal/dao" - "hotgo/internal/library/hgorm" "hotgo/internal/library/hgorm/handler" "hotgo/internal/library/location" "hotgo/internal/library/payment" @@ -188,12 +187,7 @@ func (s *sPayRefund) List(ctx context.Context, in payin.PayRefundListInp) (list return } - fields, err := hgorm.GenSelect(ctx, payin.PayRefundListModel{}, dao.PayRefund) - if err != nil { - return - } - - err = mod.Fields(fields).Page(in.Page, in.PerPage).OrderDesc(dao.PayRefund.Columns().Id).Scan(&list) + err = mod.Fields(payin.PayRefundListModel{}).Page(in.Page, in.PerPage).OrderDesc(dao.PayRefund.Columns().Id).Scan(&list) return } diff --git a/server/internal/logic/sys/curd_demo.go b/server/internal/logic/sys/curd_demo.go index 1abc0ac..48504c4 100644 --- a/server/internal/logic/sys/curd_demo.go +++ b/server/internal/logic/sys/curd_demo.go @@ -83,8 +83,8 @@ func (s *sSysCurdDemo) List(ctx context.Context, in sysin.CurdDemoListInp) (list } //关联表select - fields, err := hgorm.GenJoinSelect(ctx, sysin.CurdDemoListModel{}, dao.SysGenCurdDemo, []*hgorm.Join{ - {Dao: dao.TestCategory, Alias: "testCategory"}, + fields, err := hgorm.GenJoinSelect(ctx, sysin.CurdDemoListModel{}, &dao.SysGenCurdDemo, []*hgorm.Join{ + {Dao: &dao.TestCategory, Alias: "testCategory"}, }) if err != nil { diff --git a/server/internal/logic/sys/dict_type.go b/server/internal/logic/sys/dict_type.go index ac074d8..0a30927 100644 --- a/server/internal/logic/sys/dict_type.go +++ b/server/internal/logic/sys/dict_type.go @@ -82,7 +82,7 @@ func (s *sSysDictType) Delete(ctx context.Context, in sysin.DictTypeDeleteInp) ( // Edit 修改/新增 func (s *sSysDictType) Edit(ctx context.Context, in sysin.DictTypeEditInp) (err error) { - if err = hgorm.IsUnique(ctx, dao.SysDictType, g.Map{dao.SysDictType.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil { + if err = hgorm.IsUnique(ctx, &dao.SysDictType, g.Map{dao.SysDictType.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil { return } diff --git a/server/internal/logic/sys/login_log.go b/server/internal/logic/sys/login_log.go index ba708e7..f532d08 100644 --- a/server/internal/logic/sys/login_log.go +++ b/server/internal/logic/sys/login_log.go @@ -84,8 +84,8 @@ func (s *sSysLoginLog) List(ctx context.Context, in sysin.LoginLogListInp) (list } //关联表select - fields, err := hgorm.GenJoinSelect(ctx, sysin.LoginLogListModel{}, dao.SysLoginLog, []*hgorm.Join{ - {Dao: dao.SysLog, Alias: "sysLog"}, + fields, err := hgorm.GenJoinSelect(ctx, sysin.LoginLogListModel{}, &dao.SysLoginLog, []*hgorm.Join{ + {Dao: &dao.SysLog, Alias: "sysLog"}, }) if err != nil { diff --git a/server/internal/logic/sys/provinces.go b/server/internal/logic/sys/provinces.go index 5c13a76..de3568f 100644 --- a/server/internal/logic/sys/provinces.go +++ b/server/internal/logic/sys/provinces.go @@ -79,7 +79,7 @@ func (s *sSysProvinces) Delete(ctx context.Context, in sysin.ProvincesDeleteInp) // Edit 修改/新增省市区数据 func (s *sSysProvinces) Edit(ctx context.Context, in sysin.ProvincesEditInp) (err error) { // 关系树 - in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, dao.SysProvinces, in.Pid) + in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, &dao.SysProvinces, in.Pid) if err != nil { return } @@ -202,7 +202,7 @@ func (s *sSysProvinces) UniqueId(ctx context.Context, in sysin.ProvincesUniqueId return } - if err = hgorm.IsUnique(ctx, dao.SysProvinces, g.Map{dao.SysProvinces.Columns().Id: in.NewId}, "", in.OldId); err != nil { + if err = hgorm.IsUnique(ctx, &dao.SysProvinces, g.Map{dao.SysProvinces.Columns().Id: in.NewId}, "", in.OldId); err != nil { res.IsUnique = false return } diff --git a/server/internal/logic/sys/serve_log.go b/server/internal/logic/sys/serve_log.go index d69a93b..e4f8626 100644 --- a/server/internal/logic/sys/serve_log.go +++ b/server/internal/logic/sys/serve_log.go @@ -73,8 +73,8 @@ func (s *sSysServeLog) List(ctx context.Context, in sysin.ServeLogListInp) (list } //关联表select - fields, err := hgorm.GenJoinSelect(ctx, sysin.ServeLogListModel{}, dao.SysServeLog, []*hgorm.Join{ - {Dao: dao.SysLog, Alias: "sysLog"}, + fields, err := hgorm.GenJoinSelect(ctx, sysin.ServeLogListModel{}, &dao.SysServeLog, []*hgorm.Join{ + {Dao: &dao.SysLog, Alias: "sysLog"}, }) if err != nil {