feed_template: 配方模板查询

module/group.go

@@ -551,40 +551,39 @@ func NewSearchFeedTemplateList(ctx context.Context, req *pasturePb.SearchFeedTem
 	res := make([]*models.FeedTemplate, 0)
 
 	if req.Name != "" {
-		DBSession.Where("name like ?", "%"+req.Name+"%")
+		DBSession.And("tname like ?", "%"+req.Name+"%")
 	}
 
 	if req.CattleCategoryId > 0 {
-		DBSession.Where("ccid = ?", req.CattleCategoryId)
+		DBSession.And("ccid = ?", req.CattleCategoryId)
 	}
 
 	if req.FormulaTypeId > 0 {
-		DBSession.Where("fttypeid = ?", req.FormulaTypeId)
+		DBSession.And("fttypeid = ?", req.FormulaTypeId)
 	}
 
 	switch req.SourceId {
 	case 0:
-		DBSession.Where("source = '自定义'")
+		DBSession.And("source = '自定义'")
 	case 1:
-		DBSession.Where("source = '集团下发未调整'")
+		DBSession.And("source = '集团下发未调整'")
 	case 2:
-		DBSession.Where("source = '集团下发有调整'")
+		DBSession.And("source = '集团下发有调整'")
 	case 3:
-		DBSession.Where("source = '导入'")
+		DBSession.And("source = '导入'")
 	}
 
 	if req.Enable > 0 {
-		DBSession.Where("enable = ?", req.Enable)
+		DBSession.And("enable = ?", req.Enable)
 	}
 	if req.Remark != "" {
-		DBSession.Where("remark = ?", req.Remark)
+		DBSession.And("remark = ?", req.Remark)
 	}
 
-	DBSession.Desc("id")
-	if total, err := DBSession.Count(&res); err != nil {
+	if err := DBSession.Desc("id").Find(&res); err != nil {
 		return nil, 0, err
 	} else {
-		return res, total, nil
+		return res, int64(len(res)), nil
 	}
 }
 

service/group/feed_template.go

@@ -2,6 +2,7 @@ package group
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"tmr-watch/models"
 	"tmr-watch/module"
@@ -11,10 +12,12 @@ import (
 
 func SearchFeedTemplateList(ctx context.Context, req *feedPb.SearchFeedTemplateRequest) (*feedPb.SearchFeedTemplateResponse, error) {
 	feedTemplateList, total, err := module.NewSearchFeedTemplateList(ctx, req)
+	fmt.Println("======001=====", feedTemplateList, total, err)
 	if err != nil {
 		return nil, err
 	}
 	feedDetailVersionLogList, err := module.FeedDetailVersionLogList(ctx)
+	fmt.Println("======002======", feedDetailVersionLogList, err)
 	if err != nil {
 		return nil, err
 	}