From b2510c56349d4bde09f344a7efc94543814b0a82 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 02 七月 2019 19:18:35 +0800
Subject: [PATCH] face相关

---
 ruleserver/ruleToformula.go |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index cd99a0f..a7d4ba8 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -253,10 +253,11 @@
 	for _, sdkData := range args.Sdkdata {
 		for _, areaMap := range sdkData.AreaMapList {
 			for j := 0; j < len(groupRule.Rules); j++ {
-				args.RuleResult["face"] = putFaceToResult(groupRule.Rules[j], &areaMap, faces)
+				faces = append(faces,putFaceToResult(groupRule.Rules[j], &areaMap)...)
 			}
 		}
 	}
+	args.RuleResult["face"] = faces
 	// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
 	for j := 0; j < len(groupRule.Rules); j++ {
 		for _, sdkData := range args.Sdkdata {
@@ -352,7 +353,8 @@
 	}
 }
 
-func putFaceToResult(rule *protomsg.Rule, am *AreaMap, faces []Arg) []Arg {
+func putFaceToResult(rule *protomsg.Rule, am *AreaMap) []Arg {
+	faces := []Arg{}
 	if rule.SdkId == am.sdkId {
 		if len(am.filterData) > 0 {
 			for _, data := range am.filterData {
@@ -361,6 +363,7 @@
 			}
 		}
 	}
+	log.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
 	return faces
 }
 

--
Gitblit v1.8.0