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

controllers/activity.go

@@ -3215,8 +3215,14 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		}
 		if position == 1 {
 			leftPx += basicsHeight + rowHeight*lenList
+			if lenList > 8 {
+				lenList = leftPx - 41
+			}
 		} else {
 			rightPx += basicsHeight + rowHeight*lenList
+			if lenList > 8 {
+				lenList = leftPx - 41
+			}
 		}
 	}
 
@@ -4803,23 +4809,23 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	if len(chartPermissionIds) > 0 {
 		condition += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
 	}
-	if typeName != "" {
-		typeSlice := strings.Split(typeName, ",")
-		tempCondition := ""
-		for _, s := range typeSlice {
-			if s == "1" {
-				tempCondition += "'专家电话会',"
-			} else if s == "2" {
-				tempCondition += "'分析师电话会',"
-			} else if s == "1,2" {
-				tempCondition += "'专家电话会','分析师电话会',"
-			}
-		}
-		tempCondition = strings.TrimRight(tempCondition, ",")
-		condition += ` AND art.activity_type_name IN (` + tempCondition + `)`
-	}
+	//if typeName != "" {
+	//typeSlice := strings.Split(typeName, ",")
+	//tempCondition := ""
+	//for _, s := range typeSlice {
+	//	if s == "1" {
+	//		tempCondition += "'专家电话会',"
+	//	} else if s == "2" {
+	//		tempCondition += "'分析师电话会',"
+	//	} else if s == "1,2" {
+	//		tempCondition += "'专家电话会','分析师电话会',"
+	//	}
+	//}
+	//tempCondition = strings.TrimRight(tempCondition, ",")
+	//condition += ` AND art.activity_type_id IN (` + typeName + `)`
+	//}
 
-	conditionActivity, err := services.GetActivityonditionList(user, "", chartPermissionIds, whichDay, "3", "", 0, 0, "", 0)
+	conditionActivity, err := services.GetActivityonditionList(user, typeName, chartPermissionIds, whichDay, "3", "", 0, 0, "", 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()

services/activity.go

@@ -556,7 +556,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		if activityTypeId == strconv.Itoa(utils.ANALYST_TELL_ACTIVITY_TYPE_ID) {
 			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + activityTypeId + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
 		} else {
-			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id = ` + activityTypeId
+			condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.activity_type_id IN (` + activityTypeId + `)`
 		}
 	}