..

models/company/company_permission.go

@@ -69,7 +69,7 @@ type ChartPermissionFirst struct {
 
 func GetPermissionSetItems(productId int, classifyName string) (items []*PermissionSetItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type=0 ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 AND permission_type=0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
@@ -82,14 +82,14 @@ func GetPermissionByProductId(productId int) (items []*PermissionSetItem, err er
 }
 func GetPermissionSetItemsByType(productId int, classifyName string) (items []*PermissionSetItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type!=2 ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 AND permission_type!=2 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).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=?  ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }

models/cygx/chart_permission.go

@@ -44,7 +44,7 @@ func GetChartPermissionIco(condition string) (items []*ChartPermission, err erro
 // 获取带有ICo的产业
 func GetChartPermissionIcoNew(condition string) (items []*CygxRSlChartPermissionIcoTmp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
+	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE parent_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -56,7 +56,7 @@ func GetChartPermissionIcoNew(condition string) (items []*CygxRSlChartPermission
 // 获取带有ICo的产业
 func GetChartPermissionIcoDetail(condition string) (items []*CygxRSlChartPermissionIco, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
+	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE parent_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -68,7 +68,7 @@ func GetChartPermissionIcoDetail(condition string) (items []*CygxRSlChartPermiss
 // 获取带有ICo的产业
 func GetChartPermissionDetail(condition string) (items []*CygxReportSelectionChart, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE 1=1 `
+	sql := `SELECT chart_permission_id ,chart_permission_name,image_url as ico_link FROM chart_permission  WHERE parent_id>0 `
 	if condition != "" {
 		sql += condition
 	}
@@ -80,21 +80,21 @@ func GetChartPermissionDetail(condition string) (items []*CygxReportSelectionCha
 // 没有策略的顶级分类
 func GetChartPermissionAllNoTactics() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1 AND chart_permission_id != 23 AND is_other = 0 AND permission_type != 2   ORDER BY sort ASC   `
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1 AND chart_permission_id != 23 AND is_other = 0 AND permission_type != 2 AND parent_id>0  ORDER BY sort ASC   `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 func GetChartPermissionOtherAll() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1  AND permission_type != 2   OR is_other = 1  ORDER BY sort ASC`
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 AND is_report=1  AND permission_type != 2   OR is_other = 1 AND parent_id>0  ORDER BY sort ASC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
 // 获取产业数量
 func GetChartPermissionCount(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := ` SELECT COUNT(1) AS count  FROM chart_permission WHERE 1=1 `
+	sqlCount := ` SELECT COUNT(1) AS count  FROM chart_permission WHERE parent_id>0 `
 	if condition != "" {
 		sqlCount += condition
 	}
@@ -117,7 +117,7 @@ func GetCategoryInfoByName(name string) (item *ChartPermission, err error) {
 		name = "宏观经济"
 	}
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE permission_name=?`
+	sql := `SELECT * FROM chart_permission WHERE permission_name=? AND parent_id>0`
 	err = o.Raw(sql, name).QueryRow(&item)
 	return
 }
@@ -132,14 +132,14 @@ type ReportMapping struct {
 
 func GetReportMapping() (item []*ReportMapping, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	match_type_name != ''  `
+	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	match_type_name != '' AND parent_id>0 `
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
 
 func GetReportMappingDetail(condition string, pars []interface{}) (item *ReportMapping, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
-	sql := ` SELECT *  FROM	cygx_report_mapping WHERE	 1= 1  ` + condition + ` LIMIT 1 `
+	sql := ` SELECT *  FROM	cygx_report_mapping WHERE parent_id>0  ` + condition + ` LIMIT 1 `
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return
 }