Browse Source

no message

xingzai 2 years ago
parent
commit
5305a7bf85
2 changed files with 6 additions and 3 deletions
  1. 4 1
      controllers/activity.go
  2. 2 2
      services/activity.go

+ 4 - 1
controllers/activity.go

@@ -2032,7 +2032,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	//	return
 	//	fmt.Println("len", len(listDing))
 	//}
-	condition = " AND art.is_limit_people = 1 AND art.publish_status = 1  "
+	//condition = " AND art.is_limit_people = 1 AND art.publish_status = 1  "
 	//活动可见限制
 	conditionActivityAll, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 3)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -2074,6 +2074,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		conditionOrder = ` ORDER BY art.activity_time ASC  `
 	}
 	conditionActivityKey += condition + conditionOrder
+	//fmt.Println(conditionOrder)
 
 	list, errList := models.GetActivityListNew(conditionActivityKey, pars, uid, startSize, pageSize, playBack, filter, typeName)
 	if errList != nil {
@@ -2082,6 +2083,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		return
 	}
 
+	return
+
 	if keyWord != "" {
 		keyWordArr, err := services.GetIndustryMapNameSliceV3(keyWord)
 		if err != nil {

+ 2 - 2
services/activity.go

@@ -827,7 +827,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 	//condition += ` AND art.visible_range != 1  AND art.publish_status = 1 `
 	condition += `   AND art.publish_status = 1 `
 	if adminIds == "" {
-		condition += `  AND art.visible_range != 1 `
+		//condition += `  AND art.visible_range != 1 `
 	} else {
 		condition += ` 	AND ( art.visible_range != 1  OR  (	 art.admin_id IN ( ` + adminIds + ` )  AND art.visible_range = 1 ))  `
 	}
@@ -838,7 +838,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		condition += ` AND art.is_maker_show = 0  `
 	}
 	conditionAdmin = condition + `  AND art.visible_range = 1 `
-	condition += `  AND art.visible_range != 1 `
+	//condition += `  AND art.visible_range != 1 `
 	if (userType == 2 || userType == 3 || userType == 4) && strings.Contains(permissionStr, "专家") {
 		conditionOr += ` OR (  art.is_limit_people = 1 AND art.customer_type_ids LIKE '%4%'	 ` + condition + `) `
 	}