Merge branch 'cygx_9.3.1_0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity.go

@@ -377,7 +377,7 @@ func GetUserType(companyId int) (userType int, permissionStrnew string, err erro
 				} else if permissionZhegnshiNum == 4 || permissionZhegnshiNum == 5 {
 					userType = 10
 				} else {
-					userType = 9
+					userType = 3
 				}
 			}
 		}

services/activity_special.go

@@ -63,7 +63,7 @@ func ActivityLabelSpecialUserSql(user *models.WxUserItem) (conditionShengji, con
 		if userType != 1 && userType != 2 && userType != 10 {
 			conditionHangYe = `  art.customer_type_ids LIKE '%3%'	   AND art.chart_permission_name    IN (` + permissionZhengShiStr + `)`
 		}
-		if userType == 9 {
+		if userType == 3 {
 			conditionZhengshi = `  art.customer_type_ids LIKE '%9%'	   AND art.chart_permission_name  NOT  IN (` + permissionZhengShiStr + `)`
 		}
 	}