Merge branch 'feature/eta1.6.7_permission' into debug

controllers/company_permission.go

@@ -770,6 +770,12 @@ func (this *CompanyPermissionController) PermissionVariety() {
 	}
 
 	if productId == 1 || companyType == utils.COMPANY_PRODUCT_FICC_NAME {
+		permissionFirst, e := services.GetPermissionFirstArr(utils.COMPANY_PRODUCT_FICC_ID)
+		if e != nil {
+			br.Msg = "获取权限信息失败"
+			br.ErrMsg = "获取权限信息失败，Err:" + e.Error()
+			return
+		}
 		allFiccPermissions, e := company.GetPermissionVarietyItemsByProductId(utils.COMPANY_PRODUCT_FICC_ID)
 		if e != nil {
 			br.Msg = "获取权限信息失败"
@@ -778,21 +784,17 @@ func (this *CompanyPermissionController) PermissionVariety() {
 		}
 		permissionMap := make(map[int][]*company.PermissionVarietyItem, 0)
 		for _, v := range allFiccPermissions {
-			if v.ParentId > 0 {
-				permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
-			}
+			permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
 		}
-		for _, v := range allFiccPermissions {
-			if v.ParentId == 0 {
-				p := new(company.PermissionVarietyList)
-				p.ClassifyName = v.ClassifyName
-				p.ChartPermissionId = v.ChartPermissionId + 100
-				items, ok := permissionMap[v.ChartPermissionId]
-				if ok {
-					p.Items = items
-				}
-				resp.List = append(resp.List, p)
+		for _, v := range permissionFirst {
+			p := new(company.PermissionVarietyList)
+			p.ClassifyName = v.ClassifyName
+			p.ChartPermissionId = v.ChartPermissionId + 100
+			items, ok := permissionMap[v.ChartPermissionId]
+			if ok {
+				p.Items = items
 			}
+			resp.List = append(resp.List, p)
 		}
 		/*for k, v := range utils.PermissionFiccClassifyArr {
 			p := new(company.PermissionVarietyList)

models/company/company_permission.go

@@ -300,7 +300,7 @@ func GetPermissionVarietyItems(productId int, classifyName string) (items []*Per
 
 func GetPermissionVarietyItemsByProductId(productId int) (items []*PermissionVarietyItem, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? GROUP BY permission_name ORDER BY sort ASC `
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? and parent_id > 0 GROUP BY permission_name ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId).QueryRows(&items)
 	return
 }