fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mhw-v1.01

Browse Source
This commit is contained in:
laodaming
2023-09-21 11:15:56 +08:00
parent 4f61702e14 4391b45024
commit 37fc648025
19 changed files with 305 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
model/gmodel/fs_product_template_tags_logic.go
View File

@@ -43,8 +43,8 @@ func (pt *FsProductTemplateTagsModel) GetListByTagNames(ctx context.Context, tag
err = db.Limit(limit).Find(&resp).Error
return resp, err
}
func (pt *FsProductTemplateTagsModel) FindOneByTagName(ctx context.Context, tagName string, fields ...string) (resp *FsProductTemplateTags, err error) {
db := pt.db.WithContext(ctx).Model(&FsProductTemplateTags{}).Where("`template_tag` = ? and `status` = ?", tagName, 1)
func (pt *FsProductTemplateTagsModel) FindOneByTagName(ctx context.Context, templateTagName string, fields ...string) (resp *FsProductTemplateTags, err error) {
db := pt.db.WithContext(ctx).Model(&FsProductTemplateTags{}).Where("`template_tag` = ? and `status` = ?", templateTagName, 1)
if len(fields) != 0 {
db = db.Select(fields[0])
}

4
model/gmodel/fs_user_material_logic.go
View File

@@ -142,3 +142,7 @@ func (m *FsUserMaterialModel) GetListByUser(ctx context.Context, userId, guestId
Where(cond).Order("id DESC").Limit(limit).Find(&resp).Error
return resp, err
}
func (m *FsUserMaterialModel) FindOneByLogoResourceId(ctx context.Context, logoResourceId string) (resp *FsUserMaterial, err error) {
err = m.db.WithContext(ctx).Model(&FsUserMaterial{}).Where("`resource_id` = ?", logoResourceId).Take(&resp).Error
return resp, err
}