|
@@ -184,7 +184,7 @@ type PermissionLookItem struct {
|
|
|
// todo 确认是否需要删除
|
|
|
func GetPermissionLookItems(productId int, classifyName string) (items []*PermissionLookItem, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? ORDER BY sort ASC `
|
|
|
+ sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id > 0 ORDER BY sort ASC `
|
|
|
_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
@@ -293,7 +293,7 @@ type PermissionVarietyList struct {
|
|
|
// todo 删除品种列表
|
|
|
func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
|
|
|
+ sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id > 0 GROUP BY permission_name ORDER BY sort ASC `
|
|
|
_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
@@ -387,7 +387,7 @@ func FixPermissionStatus(companyId, productId int, startDate, endDate, status st
|
|
|
|
|
|
func GetPermissionLookItemsExt(productId string, classifyName string) (items []*PermissionLookItem, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id IN(` + productId + `) AND classify_name=? ORDER BY sort ASC `
|
|
|
+ sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id IN(` + productId + `) AND classify_name=? AND parent_id > 0 ORDER BY sort ASC `
|
|
|
_, err = o.Raw(sql, classifyName).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
@@ -473,7 +473,7 @@ func GetPermissionLookItemsSandO(permissionIds string) (items []*PermissionLookI
|
|
|
|
|
|
func GetPermissionLookItemsSandOByName(permissionName string) (items []*PermissionLookItem, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id = 2 AND remark IN (` + permissionName + `) ORDER BY sort ASC `
|
|
|
+ sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id = 2 AND remark IN (` + permissionName + `) AND parent_id > 0 ORDER BY sort ASC `
|
|
|
_, err = o.Raw(sql).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
@@ -587,7 +587,7 @@ func GetPermissionIdsByPermissionNames(names []string) (ids []int, err error) {
|
|
|
FROM
|
|
|
chart_permission
|
|
|
WHERE
|
|
|
- chart_permission_name IN (` + utils.GetOrmInReplace(len(names)) + `)`
|
|
|
+ chart_permission_name IN (` + utils.GetOrmInReplace(len(names)) + `) AND parent_id > 0 `
|
|
|
_, err = o.Raw(sql, names).QueryRows(&ids)
|
|
|
return
|
|
|
}
|