|
@@ -115,34 +115,15 @@ func GetByPermissionIdsByClassifyId(classify int) (permissionIds []int, err erro
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-func GetChartPermissionList() (items []*ChartPermission, err error) {
|
|
|
- o := orm.NewOrmUsingDB("rddp")
|
|
|
- sql := `SELECT * FROM chart_permission WHERE enabled=1 AND product_id=1 ORDER BY sort, chart_permission_id ASC`
|
|
|
- _, err = o.Raw(sql).QueryRows(&items)
|
|
|
- return
|
|
|
-}
|
|
|
-
|
|
|
-// func GetPermissionNames(ids []int) (items []string, err error) {
|
|
|
-// o := orm.NewOrmUsingDB("rddp")
|
|
|
-// condition := " AND chart_permission_id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")"
|
|
|
-// sql := `SELECT distinct permission_name FROM chart_permission WHERE enabled=1 AND product_id=1` + condition
|
|
|
-// _, err = o.Raw(sql, ids).QueryRows(&items)
|
|
|
-// return
|
|
|
-// }
|
|
|
func GetPermissionNameById(id int) (items string, err error) {
|
|
|
- o := orm.NewOrmUsingDB("rddp")
|
|
|
- sql := `SELECT distinct permission_name FROM chart_permission WHERE enabled=1 AND product_id=1 and chart_permission_id=?`
|
|
|
+ o := orm.NewOrm()
|
|
|
+ sql := `SELECT distinct name FROM permissions WHERE permission_id=?`
|
|
|
err = o.Raw(sql, id).QueryRow(&items)
|
|
|
return
|
|
|
}
|
|
|
-func GetChartPermissionByParentId(parentId int) (items []*ChartPermissionList, err error) {
|
|
|
- o := orm.NewOrmUsingDB("rddp")
|
|
|
- sql := `SELECT * FROM chart_permission WHERE enabled=1 AND chart_permission_id=? order parent_id asc ,sort asc`
|
|
|
- _, err = o.Raw(sql, parentId).QueryRows(&items)
|
|
|
- return
|
|
|
-}
|
|
|
+
|
|
|
func GetClassifyIdsByPermissionIds(condition string, pars []interface{}) (classifyIds []int, err error) {
|
|
|
- o := orm.NewOrmUsingDB("rddp")
|
|
|
+ o := orm.NewOrm()
|
|
|
sql := "select distinct classify_id from permission_classify_mapping where 1=1 "
|
|
|
if condition != "" {
|
|
|
sql += condition
|