|
@@ -72,11 +72,16 @@ func (d *ProjectDao) GetPageBsByCategory(pageData viewmodels.ProjectPage, catego
|
|
|
sql := ""
|
|
|
var args = make([]interface{}, 0)
|
|
|
|
|
|
- if category != "" {
|
|
|
+ if len(pageData.InsideCategoryId) > 0 {
|
|
|
sql += "inside_category = ?"
|
|
|
- args = append(args, category)
|
|
|
+ args = append(args, pageData.InsideCategoryId[0])
|
|
|
}
|
|
|
|
|
|
+ // if category != "" {
|
|
|
+ // sql += "inside_category = ?"
|
|
|
+
|
|
|
+ // }
|
|
|
+
|
|
|
if pageData.Search != "" {
|
|
|
args = append(args, "%"+pageData.Search+"%")
|
|
|
args = append(args, "%"+pageData.Search+"%")
|
|
@@ -169,8 +174,9 @@ func (d *ProjectDao) GetPageBs(pageData viewmodels.ProjectPage) (data []models.C
|
|
|
|
|
|
// 多余判断
|
|
|
InsideCategoryId := ""
|
|
|
- if pageData.InsideCategoryId != "" {
|
|
|
- InsideCategoryId = pageData.InsideCategoryId
|
|
|
+
|
|
|
+ if len(pageData.InsideCategoryId) > 0 {
|
|
|
+ InsideCategoryId = pageData.InsideCategoryId[0]
|
|
|
}
|
|
|
|
|
|
if InsideCategoryId != "" && pageData.Search != "" {
|