Merge branch 'crm_fix_bug_11-13' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -2852,8 +2852,15 @@ func (this *CompanyController) Add() {
 			br.ErrMsg = "新增失败,ModifyCompanyUserCompanyId err:" + err.Error()
 			return
 		}
+		//获取联系人详情
+		userInfo, err := models.GetWxUserByUserId(req.UserId)
+		if err != nil {
+			br.Msg = "获取联系人异常！"
+			br.ErrMsg = "获取联系人异常，Err:" + err.Error()
+			return
+		}
 		//添加该联系人 与 当前销售的关系
-		models.AddUserSellerRelation(int64(req.UserId), int(companyId), seller.AdminId, productId, seller.RealName, "", "")
+		models.AddUserSellerRelation(int64(req.UserId), int(companyId), seller.AdminId, productId, seller.RealName, userInfo.Mobile, userInfo.Email)
 	}
 
 	companyProduct := new(company.CompanyProduct)

controllers/cygx/report_article.go

@@ -1005,7 +1005,7 @@ func (this *ReportArticleController) Detail() {
 	}
 
 	if articleId < utils.SummaryArticleId {
-		articleInfo.Abstract = html.UnescapeString(articleInfo.Abstract)
+		articleInfo.Abstract, _ = cygx.GetReportContentTextSub(articleInfo.Abstract)
 		articleInfo.Body = html.UnescapeString(articleInfo.Body)
 	}
 	br.Ret = 200