Merge branch 'feature/eta_1.7.8' into debug

models/chart_permission.go

@@ -225,7 +225,7 @@ func GetChartPermissionList() (list []*ChartPermission, err error) {
 
 // GetChartPermissionById 主键获取品种
 func GetChartPermissionById(permissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ?`
 	err = o.Raw(sql, permissionId).QueryRow(&item)
 	return
@@ -233,7 +233,7 @@ func GetChartPermissionById(permissionId int) (item *ChartPermission, err error)
 
 // GetSecondaryChartPermissions 获取二级权限列表
 func GetSecondaryChartPermissions() (list []*ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission WHERE product_id = ? AND parent_id > 0 AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
 	_, err = o.Raw(sql, FiccProductId).QueryRows(&list)
 	return
@@ -259,7 +259,7 @@ func FormatChartPermission2Simple(origin *ChartPermission) (item *SimpleChartPer
 
 // GetChartPermissionsByProductId 获取权限列表
 func GetChartPermissionsByProductId() (list []*ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission WHERE product_id = ? AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
 	_, err = o.Raw(sql, FiccProductId).QueryRows(&list)
 	return