Merge branch 'cygx/cygx_14-5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_permission.go

@@ -100,6 +100,16 @@ func (this *CompanyPermissionController) List() {
 	// 权益
 	if productId == utils.COMPANY_PRODUCT_RAI_ID || companyType == utils.COMPANY_PRODUCT_RAI_NAME {
 		p := new(company.PermissionSetList)
+		itemsMenu, err := company.GetPermissionSetMenuItemsByType(utils.COMPANY_PRODUCT_RAI_ID)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+			return
+		}
+		var setMenuChartPermissionId []int //权益大套餐所对应的行业
+		for _, v := range itemsMenu {
+			setMenuChartPermissionId = append(setMenuChartPermissionId, v.ChartPermissionId)
+		}
 		items, err := company.GetPermissionSetItemsByType(utils.COMPANY_PRODUCT_RAI_ID, utils.COMPANY_PRODUCT_RAI_NAME)
 		if err != nil {
 			br.Msg = "获取失败"
@@ -137,9 +147,11 @@ func (this *CompanyPermissionController) List() {
 				}
 			} else {
 				p.Items = append(p.Items, &company.PermissionSetItem{
-					PermissionName: utils.CHART_PERMISSION_NAME_45W,
+					PermissionName:           utils.CHART_PERMISSION_NAME_45W,
+					SetMenuChartPermissionId: setMenuChartPermissionId,
 				}, &company.PermissionSetItem{
-					PermissionName: utils.CHART_PERMISSION_NAME_70W,
+					PermissionName:           utils.CHART_PERMISSION_NAME_70W,
+					SetMenuChartPermissionId: setMenuChartPermissionId,
 				})
 
 				// 是否为内部人员

models/company/company_permission.go

@@ -26,14 +26,15 @@ type ChartPermission struct {
 }
 
 type PermissionSetItem struct {
-	ChartPermissionId int    `description:"权限id"`
-	PermissionName    string `description:"权限名称"`
-	PermissionType    int    `description:"1主观，2客观"`
-	ParentId          int    `description:"父级权限id"`
-	IsPublic          int    `description:"是否是公有权限1:公有权限，0私有权限"`
-	Checked           bool   `description:"选中状态"`
-	ShowInput         bool   `description:"是否包含输入框"`
-	ChartContent      string `description:"权限申请时下面的框点数回显"`
+	ChartPermissionId        int    `description:"权限id"`
+	PermissionName           string `description:"权限名称"`
+	PermissionType           int    `description:"1主观，2客观"`
+	ParentId                 int    `description:"父级权限id"`
+	IsPublic                 int    `description:"是否是公有权限1:公有权限，0私有权限"`
+	Checked                  bool   `description:"选中状态"`
+	SetMenuChartPermissionId []int  `description:"大套餐所包含的权限id"`
+	ShowInput                bool   `description:"是否包含输入框"`
+	ChartContent             string `description:"权限申请时下面的框点数回显"`
 
 	Child []*PermissionSetItem `description:"具体的主客观-方便前端的排版用的"`
 }
@@ -89,6 +90,13 @@ func GetPermissionSetItemsByType(productId int, classifyName string) (items []*P
 	return
 }
 
+func GetPermissionSetMenuItemsByType(productId int) (items []*PermissionSetItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=?  AND parent_id>0 AND set_menu > 0  ORDER BY sort ASC `
+	_, err = o.Raw(sql, productId).QueryRows(&items)
+	return
+}
+
 func GetPermissionSetSandoItems(productId int, classifyName string) (items []*PermissionLookItem, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 ORDER BY sort ASC `