xingzai 11 meses atrás
pai
commit
c818bf7cb2
1 arquivos alterados com 6 adições e 5 exclusões
  1. 6 5
      services/activity.go

+ 6 - 5
services/activity.go

@@ -451,9 +451,10 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 		conditionOr += ` OR (  art.is_limit_people = 1 AND ` + conditionHangYe + condition + ` ) `
 	}
 
-	if userType == 3 {
-		condition += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
-	}
+	//if userType == 3 {
+	//	condition += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
+	//}
+
 	condition += `    AND  art.is_limit_people = 1  `
 	conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
 	return
@@ -1893,8 +1894,8 @@ func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityId
 	var pars []interface{}
 	condition = `  AND  chart_permission_id  = 31  AND yidong_activity_id = '' AND art.publish_status = 1  `
 	if activeState > 0 {
-		condition += ` AND  active_state = ?   `
-		pars = append(pars, activeState)
+		condition += ` AND  active_state =    ` + strconv.Itoa(activeState)
+
 	}
 	//pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 	if user.CompanyId > 1 {