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

---
 ruleserver/ruleToformula.go |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 27086a6..00e6b2e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -253,11 +253,10 @@
 	for _, sdkData := range args.Sdkdata {
 		for _, areaMap := range sdkData.AreaMapList {
 			for j := 0; j < len(groupRule.Rules); j++ {
-				putFaceToResult(groupRule.Rules[j], &areaMap, &faces)
+				args.RuleResult["face"] = putFaceToResult(groupRule.Rules[j], &areaMap, faces)
 			}
 		}
 	}
-	args.RuleResult["face"] = faces
 	// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
 	for j := 0; j < len(groupRule.Rules); j++ {
 		for _, sdkData := range args.Sdkdata {
@@ -353,15 +352,16 @@
 	}
 }
 
-func putFaceToResult(rule *protomsg.Rule, am *AreaMap, faces *[]Arg) {
+func putFaceToResult(rule *protomsg.Rule, am *AreaMap, faces []Arg) []Arg {
 	if rule.SdkId == am.sdkId {
 		if len(am.filterData) > 0 {
 			for _, data := range am.filterData {
 				log.Println("---------------------------------------------------------------------鏈夎繖涓猟ata")
-				*faces = append(*faces, data)
+				faces = append(faces, data)
 			}
 		}
 	}
+	return faces
 }
 
 // 璁$畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘

--
Gitblit v1.8.0