From 0732a68c8bf3ecd815c03401d37c26361bab733e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 20:56:37 +0800
Subject: [PATCH] ---

---
 insertdata/insertDataToEs.go |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index ac4bca5..2d39911 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -166,7 +166,7 @@
 		logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
 		faces := []*FaceAndRules{}
 		faces = PutFace(faces,msg)
-		logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
+		//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
 		if faces != nil {
 			for _,face := range faces {
 				// 涓婁紶澶у浘
@@ -272,7 +272,6 @@
 // 褰掔疆浜鸿劯
 func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
 	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
-		logger.Info("鏁寸悊浜鸿劯鏁版嵁")
 		for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
 			faces = hebingFace(faces, faceResult)
 		}
@@ -284,18 +283,22 @@
 func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
 	for _, arg := range faceResult.Args {
 		// 鎷垮埌姣忎竴寮犱汉鑴�
+		logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�",len(arg.Liker))
 		flag := false
 		for _, face := range faces {
+			for _,lik := range face.Liker {
+				logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細",lik.PersonId,lik.TableName)
+			}
 			if arg.Id == face.Id {
 				flag = true
 				face.rules = append(face.rules,faceResult.Result)
+				face.Liker = append(face.Liker,arg.Liker...)
 			}
 		}
 		if !flag {
 			faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
 		}
 	}
-	logger.Info("鏁寸悊涓殑鏁版嵁",faces)
 	return faces
 }
 

--
Gitblit v1.8.0