|
|
@@ -11,7 +11,7 @@ func DocActivityList(pageSize, pageNum, activityId int, appId string) ([]model.D
|
|
|
var docActivity []model.DocActivity
|
|
|
// var docs []map[string]interface{}
|
|
|
var count int64
|
|
|
- jyDocsRpcUtil.GetJyDocsDB().Model(&model.DocActivity{}).Where("activityId = ?", activityId).Count(&count)
|
|
|
+ jyDocsRpcUtil.GetJyDocsDB().Model(&model.DocActivity{}).Where("activityId = ? and appId = ?", activityId, appId).Count(&count)
|
|
|
if count > 0 {
|
|
|
jyDocsRpcUtil.GetJyDocsDB().Offset((pageNum-1)*pageSize).Limit(pageSize).Find(&docActivity, &model.DocActivity{AppId: appId, ActivityId: activityId})
|
|
|
} else {
|
