|
@@ -1591,6 +1591,8 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
|
|
|
} else if totalTitle <= searchTotal-pageSize {
|
|
|
fmt.Println("2")
|
|
|
//全部都是内容搜索
|
|
|
+ startSize = startSize - totalTitle
|
|
|
+
|
|
|
list, e = models.GetResourceDataListCondition(conditionContent, parsContent, startSize, pageSize)
|
|
|
if e != nil && e.Error() != utils.ErrNoRow() {
|
|
|
err = errors.New("GetResourceDataListCondition, Err: " + e.Error())
|
|
@@ -1599,6 +1601,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
|
|
|
} else {
|
|
|
fmt.Println("3")
|
|
|
//一半标题搜索,一半内容搜索
|
|
|
+
|
|
|
list, e = models.GetResourceDataListCondition(conditionTitle, parsTitle, startSize, pageSize)
|
|
|
if e != nil && e.Error() != utils.ErrNoRow() {
|
|
|
err = errors.New("GetResourceDataListCondition, Err: " + e.Error())
|