|
|
@@ -23,15 +23,14 @@ func GetCompanyDetailById(companyId int) (item *CompanyDetail, err error) {
|
|
|
}
|
|
|
|
|
|
func GetCompanyPermission(companyId int) (permission string, err error) {
|
|
|
- sql := ` SELECT GROUP_CONCAT(DISTINCT b.chart_permission_name SEPARATOR ',') AS permission
|
|
|
+ sql := ` SELECT GROUP_CONCAT(DISTINCT b.chart_permission_name ORDER BY b.sort ASC SEPARATOR ',') AS permission
|
|
|
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.company_id=?
|
|
|
AND a.product_id=2
|
|
|
AND b.show_type=1
|
|
|
- AND c.status IN('正式','试用','永续')
|
|
|
- ORDER BY b.sort ASC `
|
|
|
+ AND c.status IN('正式','试用','永续') `
|
|
|
o := orm.NewOrm()
|
|
|
err = o.Raw(sql, companyId).QueryRow(&permission)
|
|
|
return
|
