@ -6,3 +6,5 @@
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
/conf
@ -85,9 +85,6 @@ func (p *ArtShowProvider) ShowList(ctx context.Context, req *artShow.ShowListReq
if req.PageSize == 0 {
req.Page = 10
}
if req.IsShow == 0 {
req.IsShow = m.ARTSHOW_INSIDE
res = new(artShow.ShowListRes)
err, res = service.ArtShowList(req)
if err != nil {
@ -32,7 +32,9 @@ func ArtShowList(in *artShow.ShowListReq) (err error, total int64, out []*model.
if in.StartTime != "" && in.EndTime != "" {
queryDB = queryDB.Where("convert(show_time, date) between ? and ?", in.StartTime, in.EndTime)
if in.IsShow != 0 {
queryDB = queryDB.Where("is_show = ?", in.IsShow)
err = queryDB.Count(&total).Error