From 870d88cfdfe802984aeb9657ded935a69aed00f9 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 9 Oct 2024 11:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/svc/svc_data_center.go | 4 ++--
 app/svc/svc_index.go       | 4 ++--
 go.mod                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/svc/svc_data_center.go b/app/svc/svc_data_center.go
index 343d55d..c8ae74f 100644
--- a/app/svc/svc_data_center.go
+++ b/app/svc/svc_data_center.go
@@ -62,7 +62,7 @@ func DataCenterRecordTotal(c *gin.Context, req md.DataCenterTableReq) md.DataCen
 		where %s 
 `
 	user := GetUser(c)
-	where := "uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
+	where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
 	if req.AppId != "" || req.Platform != "" {
 		where += " and app_id in(" + appId + ")"
 	}
@@ -195,7 +195,7 @@ func comm(c *gin.Context, isTotal int, req md.DataCenterRecordReq) ([]map[string
 		where %s %s
 `
 	user := GetUser(c)
-	where := "uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
+	where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
 	if req.AppId != "" || req.Platform != "" {
 		where += " and app_id in(" + appId + ")"
 	}
diff --git a/app/svc/svc_index.go b/app/svc/svc_index.go
index 3e9cb5c..5d9ea6b 100644
--- a/app/svc/svc_index.go
+++ b/app/svc/svc_index.go
@@ -118,7 +118,7 @@ func commTotal(c *gin.Context, startDate, endDate string) []map[string]string {
 		where %s 
 `
 	user := GetUser(c)
-	where := "uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
+	where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
 	if startDate != "" {
 		where += " and date>='" + startDate + "'"
 	}
@@ -149,7 +149,7 @@ func commTotalByApp(c *gin.Context, req md.IndexAppListReq, appId []string) []ma
 		where %s group by app_id order by %s,id asc limit 10
 `
 	user := GetUser(c)
-	where := "uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
+	where := "is_generate_report=1 and uuid=" + c.GetString("mid") + " and medium_id=" + utils.IntToStr(user.MediumId)
 	if req.StartDate != "" {
 		where += " and date>='" + req.StartDate + "'"
 	}
diff --git a/go.mod b/go.mod
index 0d8a1f8..3837c84 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ go 1.18
 
 //
 require (
-	code.fnuoos.com/zhimeng/model.git v0.0.3-0.20240918130541-2345c97fc95a
+	code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241009031730-6c5d31eb7458
 	github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5
 	github.com/boombuler/barcode v1.0.1
 	github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5