Merge branch 'need/cygx_1044' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

controllers/research.go

@@ -90,6 +90,14 @@ func (this *MobileResearchController) ArticleNewList() {
 	var condition string
 	var conditiontype string
 	var pars []interface{}
+	resp := new(models.ArticleResearchListResp)
+	if user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
+		resp.List = make([]*models.ArticleResearchResp, 0)
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+	}
 	condition = `    AND publish_status = 1  `
 	if articleTypeIds == "" || strings.Contains(articleTypeIds, "999") {
 		conditiontype = " AND is_show_yanx  = 1 "
@@ -145,7 +153,7 @@ func (this *MobileResearchController) ArticleNewList() {
 		return
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
-	resp := new(models.ArticleResearchListResp)
+
 	for _, v := range list {
 
 		item := models.ArticleResearchResp{

services/cygx_yanxuan_special.go

@@ -53,6 +53,9 @@ func SendWxMsgSpecialFollow(specialId int) (err error) {
 	mobile := ``
 
 	for _, v := range userList {
+		if v.CompanyId == utils.JMCJ_COMPANY_ID {
+			continue //需求池 1043：深圳进门财经科技股份有限公司下所有的账号，所有活动的新增修改都做推送，所有的报告的新增修改都不做推送。
+		}
 		mobile += v.Mobile + ","
 	}
 

services/wechat_send_category_template_msg.go

@@ -168,6 +168,9 @@ func SendWxCategoryMsgSpecialFollow(specialId int) (err error) {
 	mobile := ``
 
 	for _, v := range userList {
+		if v.CompanyId == utils.JMCJ_COMPANY_ID {
+			continue //需求池 1043：深圳进门财经科技股份有限公司下所有的账号，所有活动的新增修改都做推送，所有的报告的新增修改都不做推送。
+		}
 		mobile += v.Mobile + ","
 	}
 

utils/constants.go

@@ -223,7 +223,8 @@ const (
 )
 
 const (
-	GAO_YI_ZI_CHAN_COMPANY_ID = 5285 // 高毅资产ID
+	GAO_YI_ZI_CHAN_COMPANY_ID = 5285  // 高毅资产ID
+	JMCJ_COMPANY_ID           = 19642 // 深圳进门财经科技股份有限公司ID
 )
 
 // 模板消息地址路由2