Merge remote-tracking branch 'origin/debug' into debug

controllers/cygx/activity.go

@@ -281,17 +281,17 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 		}
 	}
 	permissionName := req.PermissionName
-	List := cygxService.GetActChartPermissionList()
-	var haveCheck bool
-	for _, v := range List {
-		if permissionName == v.PermissionName {
-			haveCheck = true
-		}
-	}
-	if !haveCheck {
-		br.Msg = "行业名称：" + permissionName + "不存在"
-		return
-	}
+	//List := cygxService.GetActChartPermissionList()
+	//var haveCheck bool
+	//for _, v := range List {
+	//	if permissionName == v.PermissionName {
+	//		haveCheck = true
+	//	}
+	//}
+	//if !haveCheck {
+	//	br.Msg = "行业名称：" + permissionName + "不存在"
+	//	return
+	//}
 	if strings.Contains(permissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		permissionName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
@@ -1019,7 +1019,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 		}
 		list[k].IsUpload = mapUpload[v.ActivityId]
 		//是否展示签到码
-		if (v.ActivityTypeId == 5 || v.ActivityTypeId == 6) && v.SigninImg != "" && v.ActiveState == 1 && v.PublishStatus == 1 {
+		if (v.ActivityTypeId == 5 || v.ActivityTypeId == 6 || v.ActivityTypeId == 8) && v.SigninImg != "" && v.ActiveState == 1 && v.PublishStatus == 1 {
 			list[k].IsShowSigninButton = true
 		}
 	}

controllers/cygx/activity_meet.go

@@ -79,7 +79,7 @@ func (this *ActivityMeetCoAntroller) MeetList() {
 	if meetType == 1 {
 		condition += ` AND a.activity_type_id  IN (1,2,3,7)  `
 	} else {
-		condition += ` AND a.activity_type_id  IN (4,5,6) ` //默认
+		condition += ` AND a.activity_type_id  IN (4,5,6,8) ` //默认
 	}
 	if ActivityTypeId != "" {
 		condition += ` AND a.activity_type_id IN (` + ActivityTypeId + `) `
@@ -188,7 +188,7 @@ func (this *ActivityMeetCoAntroller) MeetList() {
 			list[k].IsShowUpdateMeeting = false
 		}
 		//是否展示签到码
-		if (v.ActivityTypeId == 5 || v.ActivityTypeId == 6) && v.SigninImg != "" {
+		if (v.ActivityTypeId == 5 || v.ActivityTypeId == 6 || v.ActivityTypeId == 8) && v.SigninImg != "" {
 			list[k].IsShowSigninButton = true
 		}
 		list[k].MeetPeopleNum += v.PotentialPeopleNum //加上潜在客户人数

services/cygx/activity_poster.go

@@ -92,7 +92,7 @@ func MakeActivitySigninImg(activityId int) (imgUrl string, err error) {
 	if activityInfo == nil {
 		return
 	}
-	if activityInfo.ActivityTypeId != 5 && activityInfo.ActivityTypeId != 6 {
+	if activityInfo.ActivityTypeId != 5 && activityInfo.ActivityTypeId != 6 && activityInfo.ActivityTypeId != 8 {
 		return
 	}
 	itemToken, err := models.GetWxToken(utils.WxCygxAppId, utils.WxCygxAppSecret)