|
@@ -1902,11 +1902,17 @@ func (this *ActivityController) ActivityListSearch() {
|
|
|
if pageSize <= 0 {
|
|
|
pageSize = utils.PageSize20
|
|
|
}
|
|
|
+
|
|
|
if currentIndex <= 0 {
|
|
|
currentIndex = 1
|
|
|
}
|
|
|
startSize = utils.StartIndex(currentIndex, pageSize)
|
|
|
var condition string
|
|
|
+ var conditionInit string
|
|
|
+ if keyWord != "" {
|
|
|
+ conditionInit = " AND activity_name LIKE '%" + keyWord + "%' "
|
|
|
+ }
|
|
|
+
|
|
|
//活动可见限制
|
|
|
//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "3", "", 0, 1, keyWord, playBack, 1)
|
|
|
//if err != nil && err.Error() != utils.ErrNoRow() {
|
|
@@ -1914,11 +1920,12 @@ func (this *ActivityController) ActivityListSearch() {
|
|
|
// br.ErrMsg = "获取活动权限数据失败,Err:" + err.Error()
|
|
|
// return
|
|
|
//}
|
|
|
+
|
|
|
if source == 1 {
|
|
|
condition += ` AND art.yidong_activity_id = '' `
|
|
|
}
|
|
|
|
|
|
- conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
|
|
|
+ conditionActivity, err := services.ActivityConditioninitSql(user, conditionInit, 0)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
br.Msg = "获取失败"
|
|
|
br.ErrMsg = "获取活动权限数据失败,Err:" + err.Error()
|