|
@@ -74,7 +74,7 @@ func GetActivityLabelSpecialList(userType, isPower int, chartPermissionIds, scal
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
condition = ` AND art.publish_status = 1 AND art.label != '' `
|
|
|
- condition += ` AND art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%'`
|
|
|
+
|
|
|
//行业名称
|
|
|
if isPower == 1 {
|
|
|
condition += ` AND art.chart_permission_name IN (` + permissionNameStr + `) `
|
|
@@ -86,6 +86,7 @@ func GetActivityLabelSpecialList(userType, isPower int, chartPermissionIds, scal
|
|
|
if scale != "" {
|
|
|
conditionOr += ` OR ( art.scale LIKE '%` + scale + `%' ` + condition + `) `
|
|
|
}
|
|
|
+ condition += ` AND art.customer_type_ids LIKE '%` + strconv.Itoa(userType) + `%'`
|
|
|
specialList, err := models.GetActivityLabelSpecialListAll(condition, pars, 0, 8)
|
|
|
if err != nil {
|
|
|
return
|