Merge branch 'CRM_14.7.2' into debug

# Conflicts:
#	controllers/cygx/contract_allocation.go
#	services/company.go

controllers/company_share.go

@@ -250,7 +250,7 @@ func (this *CompanyController) CompanyShareList() {
 		if productId == 1 {
 			condition += ` AND b.is_share=0 and (b.status="正式" AND b.product_id = 1) `
 		} else if productId == 2 {
-			condition += ` AND b.is_share=0 and (b.status IN ("正式","试用") AND b.product_id = 2) `
+			condition += ` AND b.is_share=0 and (b.status IN ("正式","试用","永续") AND b.product_id = 2) `
 		} else {
 			condition += ` AND b.is_share=0 and ((b.status="正式" AND b.product_id = 1) OR (b.status IN ("正式","试用") AND b.product_id = 2))`
 		}

services/company.go

@@ -2419,21 +2419,20 @@ func GetShareCompanyPermissionButton(roleTypeCode, statuses string, productId in
 	if roleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
 		button.BtnModifySeller = false
 	}
-	status, _ := statusMap[1]
-	//if !ok {
-	//	return
-	//}
+	status, ok := statusMap[1]
+	if !ok {
+		return
+	}
 	// 客户非关闭状态可见沟通记录按钮
 	if status != utils.COMPANY_STATUS_CLOSE {
 		button.BtnServiceRecord = true
 	}
 
-	// 销售
-	sellerArr := []string{
+	// ficc销售
+	ficcArr := []string{
 		utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM, utils.ROLE_TYPE_CODE_FICC_SELLER,
-		utils.ROLE_TYPE_CODE_RAI_GROUP,utils.ROLE_TYPE_CODE_RAI_SELLER,utils.ROLE_TYPE_CODE_RAI_ADMIN,
 	}
-	if !utils.InArrayByStr(sellerArr, roleTypeCode) {
+	if !utils.InArrayByStr(ficcArr, roleTypeCode) {
 		return
 	}
 	if status == utils.COMPANY_STATUS_TRY_OUT {

services/cygx/activity_poster.go

@@ -333,12 +333,15 @@ func MakeCygxMp4HtmlImg(videoDuration string) (imgUrl string, err error) {
 //	//MakeActivityMomentsImg(2850)
 //	var condition string
 //	var pars []interface{}
-//	condition = " AND   chart_permission_id  = 31  AND  publish_status   = 1   ORDER BY  activity_id DESC  "
+//	condition = " AND   chart_permission_id  = 31  AND  publish_status   = 1   AND active_state  = 1  ORDER BY  activity_id DESC   "
 //	list, errList := cygx.GetActivityListAll(condition, pars, 0, 9999)
 //	if errList != nil {
 //		fmt.Println(errList)
 //		return
 //	}
+//	fmt.Println("list", len(list))
+//
+//	//return
 //	for _, v := range list {
 //		MakeActivityMomentsImg(v.ActivityId)
 //	}

services/cygx/research_summary.go

@@ -601,12 +601,13 @@ func DoXzsChooseSend(chartPermissionName string) string {
 //	var condition string
 //	var pars []interface{}
 //	condition = " AND   article_type_id  > 0   AND  publish_status   = 1   ORDER BY  article_id  DESC "
-//	list, errList := cygx.GetCygxArticleList(condition, pars, 0, 50)
+//	list, errList := cygx.GetCygxArticleList(condition, pars, 0, 999)
 //	if errList != nil {
 //		fmt.Println(errList)
 //		return
 //	}
-//
+//	fmt.Println("list", len(list))
+//	//return
 //	for k, v := range list {
 //		fmt.Println(k)
 //		MakeArticleMomentsImg(v.ArticleId)