From 7a607b3c9c592f6db8ea9a90eb1a92bbec06063d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 17 Jan 2020 18:38:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/event.go | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/business/model/dao/event.go b/business/model/dao/event.go
index 1a2005a39..3ac394be5 100644
--- a/business/model/dao/event.go
+++ b/business/model/dao/event.go
@@ -87,18 +87,28 @@ func GetOperateEvents(db *DaoDB, name string, apiFunctions []string, operateType
 	if err = GetRows(db, &operateEventExt, sql, sqlParams...); err == nil {
 		totalCount = GetLastTotalRowCount(db)
 	}
+	var (
+		accessUUidList []string
+		details        []*model.OperateEventDetail
+		detailMap      = make(map[string][]*model.OperateEventDetail)
+	)
 	for _, v := range operateEventExt {
-		var details []*model.OperateEventDetail
-		sql := `
+		accessUUidList = append(accessUUidList, v.AccessUUID)
+	}
+	sql2 := `
 			SELECT * 
 			  FROM operate_event_detail
-			 WHERE access_uuid = ? 
+			 WHERE access_uuid IN (` + GenQuestionMarks(len(accessUUidList)) + `)
 		`
-		sqlParams := []interface{}{
-			v.AccessUUID,
+	sqlParams2 := []interface{}{accessUUidList}
+	err = GetRows(db, &details, sql2, sqlParams2...)
+	for _, v := range details {
+		detailMap[v.AccessUUID] = append(detailMap[v.AccessUUID], v)
+	}
+	for _, v := range operateEventExt {
+		if detailMap[v.AccessUUID] != nil {
+			v.Detail = detailMap[v.AccessUUID]
 		}
-		err = GetRows(db, &details, sql, sqlParams...)
-		v.Detail = details
 	}
 	return operateEventExt, totalCount, err
 }

From 3fe8835d4d407a89c5ea4a83cc655baf5d1aff6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sun, 19 Jan 2020 08:27:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81cookie?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=A5=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/event/event.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/event/event.go b/business/jxstore/event/event.go
index 133d3c27c..4e7157cc9 100644
--- a/business/jxstore/event/event.go
+++ b/business/jxstore/event/event.go
@@ -192,7 +192,7 @@ func GetCheckVendorCookie(ctx *jxcontext.Context, vendorIDs []int, isAuto bool)
 		// 	ccList = append(ccList, cc)
 		// }
 	}
-	if isAuto && len(ccList) > 0 {
+	if isAuto && errMsg != "" {
 		globals.SugarLogger.Warnf("GetCheckVendorCookie：[%v]", errMsg)
 	}
 	return ccList, err