Parcourir la source

Merge branch 'feature/bug-list' of xuyiping/kpt-tmr-group into develop

xuyiping il y a 1 an
Parent
commit
0451ced03b
2 fichiers modifiés avec 7 ajouts et 3 suppressions
  1. 3 3
      http/handler/feed/feed_formula.go
  2. 4 0
      module/backend/statistic_service.go

+ 3 - 3
http/handler/feed/feed_formula.go

@@ -277,8 +277,8 @@ func DistributeFeedFormula(c *gin.Context) {
 
 // Usage 配方使用情况
 func Usage(c *gin.Context) {
-	req := &operationPb.FeedFormulaUsageRequest{}
-	if err := ginutil.BindProto(c, req); err != nil {
+	var req operationPb.FeedFormulaUsageRequest
+	if err := ginutil.BindProto(c, &req); err != nil {
 		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return
 	}
@@ -292,7 +292,7 @@ func Usage(c *gin.Context) {
 		return
 	}
 
-	if err := middleware.BackendOperation(c).OpsService.FeedFormulaUsage(c, req); err != nil {
+	if err := middleware.BackendOperation(c).OpsService.FeedFormulaUsage(c, &req); err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
 	}

+ 4 - 0
module/backend/statistic_service.go

@@ -746,6 +746,10 @@ func (s *StoreEntry) SearchProcessAnalysis(ctx context.Context, req *operationPb
 	if _, err = s.PastureHttpClient(ctx, model.UrlProcess, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
+
+	if response.Data.List == nil {
+		response.Data.List = []int64{}
+	}
 	return response, nil
 }