feat:完善项目
This commit is contained in:
@ -19,17 +19,26 @@ type NoticeInfo struct {
|
||||
}
|
||||
|
||||
// List 列表信息
|
||||
func (c *Notice) List(page, pageSize int) (*basic.PageDataResponse, error) {
|
||||
func (c *Notice) List(title string, page, pageSize int) (*basic.PageDataResponse, error) {
|
||||
mManageNotice := model.NewManageNotice()
|
||||
|
||||
out := make([]*model2.ManageNotice, 0)
|
||||
|
||||
var count int64
|
||||
|
||||
if err := model2.Pages(mManageNotice.ManageNotice, &out, page, pageSize, &count, &model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("tenant_id", c.TenantID),
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc),
|
||||
}); err != nil {
|
||||
where := []*model2.ModelWhereOrder{
|
||||
&model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("tenant_id", c.TenantID),
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc),
|
||||
},
|
||||
}
|
||||
|
||||
if title != "" {
|
||||
where = append(where, &model2.ModelWhereOrder{
|
||||
Where: model2.NewWhereLike("title", title),
|
||||
})
|
||||
}
|
||||
if err := model2.Pages(mManageNotice.ManageNotice, &out, page, pageSize, &count, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
list := make([]*NoticeInfo, 0)
|
||||
@ -69,6 +78,7 @@ func (c *Notice) Form(id uint64, title, content string) error {
|
||||
"title": title, "content": content, "updated_at": time.Now(),
|
||||
})
|
||||
}
|
||||
mManageNotice.TenantID = c.TenantID
|
||||
mManageNotice.Title = title
|
||||
mManageNotice.Content = content
|
||||
return model2.Create(mManageNotice)
|
||||
|
Reference in New Issue
Block a user