Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_13.8

controllers/home.go

@@ -671,7 +671,7 @@ func (this *HomeController) NewList() {
 	//	condition += `  AND IF ( source = 'activity' , source_id  NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
 	//	pars = append(pars, yiDongactivityIds)
 	//} else {
-	condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx')   AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 )  ` + conditionInit
+	condition += ` AND  is_hide = 0  AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx')   AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 )  ` + conditionInit
 	//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
 	conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {

models/activity_video.go

@@ -58,7 +58,7 @@ type CygxActivityVideoListRep struct {
 // 列表
 func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
+	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  AND  v.is_hide = 0  `
 	if condition != "" {
 		sql += condition
 	}
@@ -124,7 +124,7 @@ func GetActivityVideoActivityIds() (activityIds string, err error) {
 	sql := `SELECT
 				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
 			FROM
-				cygx_activity_video AS a `
+				cygx_activity_video AS a  WHERE  is_hide = 0 `
 	o := orm.NewOrm()
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return

models/activity_voice.go

@@ -64,7 +64,7 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 			cygx_activity_voice AS v
 			INNER JOIN cygx_activity AS a ON a.activity_id = v.activity_id 
 		WHERE
-			1 = 1 	 AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
+			1 = 1  AND  v.is_hide = 0  	 AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, activityIds).QueryRows(&items)
 	return
@@ -132,7 +132,7 @@ func GetActivityVoiceActivityIds() (activityIds string, err error) {
 	sql := `SELECT
 				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
 			FROM
-				cygx_activity_voice AS a `
+				cygx_activity_voice AS a  WHERE  is_hide = 0  `
 	o := orm.NewOrm()
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return

models/send_company_user.go

@@ -136,7 +136,7 @@ func GetSendCompanyPermissionDataList(condition string, pars []interface{}) (ite
 				1 = 1
 				AND cp.STATUS IN ( '正式', '试用', '永续' )
 				AND c.enabled = 1
-				AND c.chart_permission_name IN ( '医药', '消费', '科技', '智造', '策略', '研选扣点包', '专家', '路演服务','固收','周期' ) ` + condition + ` GROUP BY c.permission_name, cp.company_id `
+				AND c.chart_permission_name IN ( '医药', '消费', '科技', '智造', '策略', '研选订阅', '研选扣点包', '专家', '路演服务','固收','周期' ) ` + condition + ` GROUP BY c.permission_name, cp.company_id `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

services/activity_special.go

@@ -655,7 +655,7 @@ func GetSpecialTripUserSchedule(userId int) (total int, err error) {
 
 // GetActivitySpecialList 获取专项调研列表
 func GetActivitySpecialList(user *models.WxUserItem, currentIndex, pageSize int, keywords string) (list []*models.CygxActivitySpecialDetail, total int, err error) {
-	if user.CompanyId < 1 {
+	if user.CompanyId <= 1 {
 		return
 	}
 	listConfirm, totalConfirm, e := GetActivityLabelSpecialConfirmList(user, (currentIndex-1)*pageSize, pageSize, 4, keywords)

services/es_comprehensive.go

@@ -1556,7 +1556,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	keyWord = "%" + keyWord + "%"
 	var conditionTitle string
 	var parsTitle []interface{}
-	conditionTitle = " AND search_title LIKE ? AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
+	conditionTitle = " AND is_hide = 0  AND search_title LIKE ? AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsTitle = append(parsTitle, keyWord)
 	totalTitle, e := models.GetResourceDataCount(conditionTitle, parsTitle)
 	if e != nil {
@@ -1567,7 +1567,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	var conditionContent string
 	var parsContent []interface{}
 
-	conditionContent = " AND search_content LIKE ? AND search_title  NOT LIKE ?  AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
+	conditionContent = " AND is_hide = 0 AND search_content LIKE ? AND search_title  NOT LIKE ?  AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsContent = append(parsContent, keyWord, keyWord)
 	totalContent, e := models.GetResourceDataCount(conditionContent, parsContent)
 	if e != nil {

services/micro_roadshow.go

@@ -384,8 +384,8 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		conditionAskserie += ` AND a.chart_permission_id IN (` + chartPermissionIds + `)`
 	}
 	//发布状态
-	audioAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31 `
-	videoAct += ` AND  b.publish_status = 1  AND  b.chart_permission_id  != 31 `
+	audioAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31  AND  a.is_hide = 0 `
+	videoAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31  AND  a.is_hide = 0 `
 	videoMico += ` AND  a.publish_status = 1 AND  a.chart_permission_id  != 31 `
 	conditionAskserie += ` AND  a.publish_status = 1  AND  a.chart_permission_id  != 31 `
 

services/send_company_user.go

@@ -256,6 +256,9 @@ func DotongbuShangHaApi(condition string) (err error) {
 			if v.PermissionName == utils.YAN_XUAN_KOU_DIAN_BAO_NAME {
 				v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
 			}
+			if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+				v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+			}
 			if v.PermissionName == utils.GU_SHOU_NAME {
 				v.PermissionName = "固定收益"
 			}

utils/email.go

@@ -75,11 +75,11 @@ func SendEmailByHz(title, content string, touser string) (result bool, err error
 		arr = append(arr, touser)
 	}
 	m := gomail.NewMessage()
-	m.SetHeader("From", "public@hzinsights.com")
+	m.SetHeader("From", "hzcygx@hzinsights.com")
 	m.SetHeader("To", arr...)
 	m.SetHeader("Subject", title)
 	m.SetBody("text/html", content)
-	d := gomail.NewDialer("smtp.mxhichina.com", 465, "public@hzinsights.com", "Hzinsights2018")
+	d := gomail.NewDialer("smtp.mxhichina.com", 465, "hzcygx@hzinsights.com", "Hzinsights2024")
 	if err := d.DialAndSend(m); err != nil {
 		result = false
 		return result, err
@@ -127,7 +127,7 @@ func SendEmailByHongze(title, content string, touser, attachPath, attachName str
 	}
 	m := gomail.NewMessage()
 
-	m.SetHeader("From", "public@hzinsights.com")
+	m.SetHeader("From", "hzcygx@hzinsights.com")
 	m.SetHeader("To", arr...)
 	m.SetHeader("Subject", title)
 	m.SetBody("text/html", content)
@@ -142,7 +142,7 @@ func SendEmailByHongze(title, content string, touser, attachPath, attachName str
 				},
 			}))
 	}
-	d := gomail.NewDialer("smtp.mxhichina.com", 465, "public@hzinsights.com", "Hzinsights2018")
+	d := gomail.NewDialer("smtp.mxhichina.com", 465, "hzcygx@hzinsights.com", "Hzinsights2024")
 	if err := d.DialAndSend(m); err != nil {
 		fmt.Println("send err:", err.Error())
 		return false