Merge branch 'CRM_15.5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

models/company/company_product.go

@@ -102,8 +102,8 @@ type CompanyProductDetail struct {
 	IsShare          int       `description:"0:非共享用户,1:共享客户"`
 	ShareSeller      string    `description:"共享销售员"`
 	ShareSellerId    int       `description:"共享销售员id"`
-	ViewTotal        int       `description:"总阅读次数"`
 	PermissionList   []*PermissionLookList
+	ViewTotal        int `description:"总阅读次数"`
 }
 
 func GetCompanyProductsByCompanyId(companyId int) (items []*CompanyProductDetail, err error) {

services/cygx/activity_power_check.go

@@ -282,6 +282,8 @@ func GetActivityDetailUserPower(user *models.WxUser, adminInfo *system.Admin, ac
 	//如果权限不包含那么直接返回
 	if !strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 		return
+	} else {
+		havePower = true
 	}
 
 	//处理决策人可见权限