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

models/search_key_word.go

@@ -6,15 +6,16 @@ import (
 )
 
 type CygxSearchKeyWord struct {
-	Id          int `orm:"column(id);" description:"id"`
-	KeyWord     string
-	UserId      int
-	CreateTime  time.Time
-	Mobile      string `description:"手机号"`
-	Email       string `description:"邮箱"`
-	CompanyId   int    `description:"公司id"`
-	CompanyName string `description:"公司名称"`
-	RealName    string `description:"用户实际名称"`
+	Id               int `orm:"column(id);" description:"id"`
+	KeyWord          string
+	UserId           int
+	CreateTime       time.Time
+	Mobile           string `description:"手机号"`
+	Email            string `description:"邮箱"`
+	CompanyId        int    `description:"公司id"`
+	CompanyName      string `description:"公司名称"`
+	RealName         string `description:"用户实际名称"`
+	RegisterPlatform int    `description:"来源 1小程序，2：网页"`
 }
 
 // 新增搜索

models/send_company_user.go

@@ -135,6 +135,7 @@ func GetSendCompanyPermissionDataList(condition string, pars []interface{}) (ite
 			WHERE
 				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 `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return

services/keyword.go

@@ -30,6 +30,7 @@ func AddSearchKeyWord(user *models.WxUserItem, keyWord string, source int) (err
 	keyWordItem.CompanyId = user.CompanyId
 	keyWordItem.CompanyName = user.CompanyName
 	keyWordItem.RealName = user.RealName
+	keyWordItem.RegisterPlatform = utils.REGISTER_PLATFORM
 	_, err = models.AddSearchKeyWord(keyWordItem)
 	go AddUserSearchLog(user, keyWord, source)
 	go SearchKeywordUserRmind(user, keyWord)

utils/constants.go

@@ -182,7 +182,7 @@ const (
 	WX_MSG_PATH_PRODUCTINTERIOR_DETAIL   = "reportPages/internalDetials/internalDetials?id="              //产品内测详情模板消息地址
 	WX_MSG_PATH_THIS_WEEK_DETAIL         = "reportPages/reportSecretDetail/reportSecretDetail?type=2&id=" //本周研究汇总详情模板消息地址
 	WX_MSG_PATH_LAST_WEEK_DETAIL         = "reportPages/reportSecretDetail/reportSecretDetail?type=3&id=" //上周纪要汇总详情模板消息地址
-	WX_MSG_PATH_KEY_COMPANY_DETAIL       = "reportPages/keyCompany/keyCompany"                            //重点公司详情模板消息地址
+	WX_MSG_PATH_KEY_COMPANY_DETAIL       = "reportPages/keyCompany/keyCompany?id="                        //重点公司详情模板消息地址
 	WX_MSG_PATH_RESEARCHTHEME_DETAIL     = "reportPages/researchTheme/researchTheme?id="                  //主题详情模板消息地址
 	WX_MSG_PATH_ACTIVITY_SIGN            = "pages-message/activityTemplate/activityTemplate?id="          //活动模板消息地址
 	WX_MSG_PATH_APPLY_DETAIL             = "pages-message/applyFor/applyFor?id="                          //潜在用户试用权限申请