Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -3328,8 +3328,6 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	}
 	if userType == 1 {
 		conditionOr += ` OR (` + condition + permissionSqlStr + `) `
-	} else {
-		conditionOr += ` OR ( 1=1 ` + condition + `) `
 	}
 
 	if companyProduct != nil {
@@ -3506,8 +3504,6 @@ func (this *ActivityCoAntroller) SpecialList() {
 	}
 	if userType == 1 {
 		conditionOr += ` OR (` + condition + permissionSqlStr + `) `
-	} else {
-		conditionOr += ` OR ( 1=1 ` + condition + `) `
 	}
 	if companyProduct != nil {
 		if companyProduct.Scale != "" {