Merge branch 'permission_1130'

controller/contract/register.go

@@ -1805,7 +1805,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 	}
 
 	// 获取小套餐品种
-	cpCond := `product_id = ? AND permission_name <> ?`
+	cpCond := `product_id = ? AND permission_name <> ? AND enabled = 1 `
 	cpPars := make([]interface{}, 0)
 	cpPars = append(cpPars, crm.CompanyProductFicc, crm.ChartPermissionStrategyName)
 	cp := new(crm.ChartPermission)