Merge branch 'cygx/cygx_13.2' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/cygx/activity_power_check.go

@@ -249,12 +249,17 @@ func GetActivityDetailUserPower(user *models.WxUser, adminInfo *system.Admin, ac
 		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
 
-	//如果用户开通了研选扣点包，但是没开通研选订阅，那么就拼接一个研选订阅的权限名称
-	if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) && strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+	//如果正式权限有开通 研选扣点包 ，那么就拼接一个 研选订阅的权限
+	if strings.Contains(permissionStrZhengShi, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
 		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 		permissionStrZhengShi += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
 
+	//如果测试权限有开通 研选扣点包 ，那么就拼接一个 研选订阅的权限
+	if strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+	}
+
 	//如果一个权限都没有就返回无权限
 	if permissionStr == "" {
 		return

services/cygx/contract_allocation.go

@@ -367,6 +367,9 @@ func HandleAllocationCompanyContractByYanXuan(companyContractId int) (err error)
 		item.ModifyTime = time.Now()
 		items = append(items, item)
 	}
+	if len(items) == 0 {
+		return
+	}
 	e = cygx.AddAndUpdateCygxAllocationCompanyContract(items, itemsPermission, companyContractId)
 	if e != nil {
 		err = errors.New("AddAndUpdateCygxAllocationCompanyContract, Err: " + e.Error())