diff --git a/api/v1/friendlink.proto b/api/v1/friendlink.proto index 46782d7..94db35a 100644 --- a/api/v1/friendlink.proto +++ b/api/v1/friendlink.proto @@ -36,6 +36,7 @@ message ListFriendlinkRequest { int32 size = 2; string wd = 3; repeated bool enable = 4; + repeated string field = 5; } message ListFriendlinkReply { diff --git a/biz/friendlink.go b/biz/friendlink.go index 7397981..75d8906 100644 --- a/biz/friendlink.go +++ b/biz/friendlink.go @@ -107,9 +107,10 @@ func (s *FriendlinkAPIService) GetFriendlink(ctx context.Context, req *pb.GetFri func (s *FriendlinkAPIService) ListFriendlink(ctx context.Context, req *pb.ListFriendlinkRequest) (*pb.ListFriendlinkReply, error) { opt := &model.OptionGetFriendlinkList{ - WithCount: true, - Page: int(req.Page), - Size: int(req.Size_), + WithCount: true, + Page: int(req.Page), + Size: int(req.Size_), + SelectFields: req.Field, } _, err := s.checkPermission(ctx) diff --git a/model/banner.go b/model/banner.go index f68c518..db59542 100644 --- a/model/banner.go +++ b/model/banner.go @@ -37,11 +37,12 @@ func (m *DBModel) CreateBanner(banner *Banner) (err error) { // UpdateBanner 更新Banner,如果需要更新指定字段,则请指定updateFields参数 func (m *DBModel) UpdateBanner(banner *Banner, updateFields ...string) (err error) { db := m.db.Model(banner) - - updateFields = m.FilterValidFields(Banner{}.TableName(), updateFields...) - if len(updateFields) > 0 { // 更新指定字段 - db = db.Select(updateFields) + tableName := Banner{}.TableName() + updateFields = m.FilterValidFields(tableName, updateFields...) + if len(updateFields) == 0 { + updateFields = m.GetTableFields(tableName) } + db = db.Select(updateFields) err = db.Where("id = ?", banner.Id).Updates(banner).Error if err != nil { diff --git a/web/components/FormCategory.vue b/web/components/FormCategory.vue index a51251d..48731df 100644 --- a/web/components/FormCategory.vue +++ b/web/components/FormCategory.vue @@ -159,7 +159,11 @@ export default { } if (this.category.id > 0) { - if (category.parent_id > 0 || category.parent_id.length > 0) { + if ( + category.parent_id > 0 || + (typeof category.parent_id === 'object' && + category.parent_id.length > 0) + ) { category.cover = '' } diff --git a/web/layouts/default.vue b/web/layouts/default.vue index 70f6df2..db58939 100644 --- a/web/layouts/default.vue +++ b/web/layouts/default.vue @@ -57,11 +57,15 @@
友情链接
- 书栈网 - 摩枫网络科技{{ link.title }} - 卓一信息