From 3734bbd3cf32fda02d9bfd21e21c4daa3888f92a Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Thu, 7 May 2020 19:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=AC=E5=85=B1=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E9=80=82=E5=BA=94=E4=BF=AE=E6=94=B9=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_bfapi/PolicyObject.robot      | 4 ++--
 02-Keyword/tsg_common/ManagePolicyBody.robot | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/02-Keyword/tsg_bfapi/PolicyObject.robot b/02-Keyword/tsg_bfapi/PolicyObject.robot
index d8ce907..e9a1c7b 100644
--- a/02-Keyword/tsg_bfapi/PolicyObject.robot
+++ b/02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -117,7 +117,7 @@ AddPolicy2
     [Return]    ${rescode}    ${policyId}
     
 EditPolicy
-    [Arguments]    ${policyList}     ${returnData}    ${opAction}
+    [Arguments]    ${returnData}    ${policyList}    ${opAction}
     
     #add:表示新增 
     #update:表示修改策略内容，包括策略名称，策略动作，策略动作参数，引用的策略文件，引用的策略对象等有修改时 
@@ -126,7 +126,7 @@ EditPolicy
     ${body}    PolicyParamsOpertion    ${1}    ${policyList}    ${opAction}    
     ${response}    BaseEditRequest    /policy/compile    ${body}    
     ${rescode}    Set Variable     ${response['code']}
-    [Return]     ${rescode}    ${policyId}    ${response}
+    [Return]     ${rescode}    ${response}
 
 DeletePolicybak
     [Arguments]    ${policyids}
diff --git a/02-Keyword/tsg_common/ManagePolicyBody.robot b/02-Keyword/tsg_common/ManagePolicyBody.robot
index 3b3a372..1db9ca1 100644
--- a/02-Keyword/tsg_common/ManagePolicyBody.robot
+++ b/02-Keyword/tsg_common/ManagePolicyBody.robot
@@ -64,7 +64,7 @@ PolicyParamsOpertion
 	                  ...    ELSE    Evaluate    list(map(int, re.split('[,]', '${appObjectIdArray}')))    re	
     Set To Dictionary    ${policyList}    appObjectIdArray=${appObjectIdArrayV} 
     # 固定值
-    Set To Dictionary    ${policyList}    policyId=    doBlacklist=${0}
+    Set To Dictionary    ${policyList}    doBlacklist=${0}
     # 分别处理EffectiveRange、UserRegion和ReferenceObject参数
     ManageEffectiveRange    ${policyList}
     #ManageUserRegion    ${policyList}