|
@@ -52,17 +52,17 @@ func GetProductCatsByAncestry(ancestry string, employ bool) (cats []*ProductCat)
|
|
|
o := orm.NewOrm()
|
|
o := orm.NewOrm()
|
|
|
qs := o.QueryTable(new(ProductCat))
|
|
qs := o.QueryTable(new(ProductCat))
|
|
|
if ancestry == "" {
|
|
if ancestry == "" {
|
|
|
- qs.Filter("status", 1).Filter("ancestry__isnull", true).
|
|
|
|
|
|
|
+ qs = qs.Filter("status", 1).Filter("ancestry__isnull", true).
|
|
|
OrderBy("-position")
|
|
OrderBy("-position")
|
|
|
} else if ancestry == "0" {
|
|
} else if ancestry == "0" {
|
|
|
//3为审核类别,暂写死
|
|
//3为审核类别,暂写死
|
|
|
- qs.Filter("status", 1).OrderBy("-position")
|
|
|
|
|
|
|
+ qs = qs.Filter("status", 1).OrderBy("-position")
|
|
|
} else {
|
|
} else {
|
|
|
- qs.Filter("status", 1).Filter("ancestry", ancestry).
|
|
|
|
|
|
|
+ qs = qs.Filter("status", 1).Filter("ancestry", ancestry).
|
|
|
OrderBy("-position")
|
|
OrderBy("-position")
|
|
|
}
|
|
}
|
|
|
if !employ {
|
|
if !employ {
|
|
|
- qs.Exclude("id", 25)
|
|
|
|
|
|
|
+ qs = qs.Exclude("id", 25)
|
|
|
}
|
|
}
|
|
|
qs.All(&cats)
|
|
qs.All(&cats)
|
|
|
return cats
|
|
return cats
|