From 8ccae9a9679d41a8cb1511594824133478f383b6 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Thu, 7 May 2020 20:00:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=AD=96=E7=95=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=8D=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=89=80=E4=BB=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E7=9A=84=E6=98=AF=E5=90=A6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=8F=82=E6=95=B0=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=8B=BC=E6=8E=A5=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?json=E6=97=B6=E6=8A=8Apolicyid=E7=BD=AE=E7=A9=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=BA=E4=BF=AE=E6=94=B9=E4=B8=8D=E7=BD=AE=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BD=AE=E7=A9=BA?=
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 | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/02-Keyword/tsg_bfapi/PolicyObject.robot b/02-Keyword/tsg_bfapi/PolicyObject.robot
index e9a1c7b..3132f5d 100644
--- a/02-Keyword/tsg_bfapi/PolicyObject.robot
+++ b/02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -117,13 +117,13 @@ AddPolicy2
     [Return]    ${rescode}    ${policyId}
     
 EditPolicy
-    [Arguments]    ${returnData}    ${policyList}    ${opAction}
+    [Arguments]    ${policyList}    ${opAction}
     
     #add:表示新增 
     #update:表示修改策略内容，包括策略名称，策略动作，策略动作参数，引用的策略文件，引用的策略对象等有修改时 
     #disable:表示停用，只修改isValid属性为0 
     #enable：表示启用，只修改isValid属性为1
-    ${body}    PolicyParamsOpertion    ${1}    ${policyList}    ${opAction}    
+    ${body}    PolicyParamsOpertion    ${0}    ${policyList}    ${opAction}    
     ${response}    BaseEditRequest    /policy/compile    ${body}    
     ${rescode}    Set Variable     ${response['code']}
     [Return]     ${rescode}    ${response}
diff --git a/02-Keyword/tsg_common/ManagePolicyBody.robot b/02-Keyword/tsg_common/ManagePolicyBody.robot
index 1db9ca1..e185aa1 100644
--- a/02-Keyword/tsg_common/ManagePolicyBody.robot
+++ b/02-Keyword/tsg_common/ManagePolicyBody.robot
@@ -63,8 +63,10 @@ PolicyParamsOpertion
 	${appObjectIdArrayV}    Run Keyword If    "${return}"=="FAIL" or "${appObjectIdArray}"=="${EMPTY}"    Evaluate    list(map(int, re.split('[,]', '${Default_AppObjectIdArray}')))    re
 	                  ...    ELSE    Evaluate    list(map(int, re.split('[,]', '${appObjectIdArray}')))    re	
     Set To Dictionary    ${policyList}    appObjectIdArray=${appObjectIdArrayV} 
+    ${policyId}    Run Keyword If    "${opAction}"=="add"     Set Variable    ${EMPTY}
+                    ...    ELSE    Set Variable    ${policyList}[policyId]       
     # 固定值
-    Set To Dictionary    ${policyList}    doBlacklist=${0}
+    Set To Dictionary    ${policyList}    policyId=${policyId}    doBlacklist=${0}
     # 分别处理EffectiveRange、UserRegion和ReferenceObject参数
     ManageEffectiveRange    ${policyList}
     #ManageUserRegion    ${policyList}