no message

models/chart_permission.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
+	"strings"
 	"time"
 )
 
@@ -59,7 +60,36 @@ func GetChartPermissionActivity() (items []*ActivityChartPermission, err error)
 	return
 }
 
+//处理添加主观客观之后的分类ID错误
 func GetUserCompanyPermission(companyId int) (items []*ActivityChartPermission, err error) {
+	list, err := GetUserCompanyPermissionSandO(companyId)
+	if err != nil {
+		return
+	}
+	var chartPermissionName string
+	for _, v := range list {
+		chartPermissionName += "'" + v.PermissionName + "'" + ","
+	}
+	chartPermissionName = strings.Trim(chartPermissionName, ",")
+	sql := ` SELECT b.*
+			FROM company_report_permission AS a
+			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
+			INNER JOIN company_product AS c ON a.company_id=c.company_id AND a.product_id=c.product_id
+			WHERE a.product_id=2
+			AND c.is_suspend=0
+            AND b.cygx_auth=1
+            AND b.is_other=0
+			AND c.status IN('正式','试用','永续')
+			AND a.status IN('正式','试用','永续') 
+			AND b.chart_permission_name IN (` + chartPermissionName + `)
+			GROUP BY b.chart_permission_name
+			ORDER BY b.sort ASC `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+func GetUserCompanyPermissionSandO(companyId int) (items []*ActivityChartPermission, err error) {
 	sql := ` SELECT b.*
 			FROM company_report_permission AS a
 			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id