From 2fea3463d18ccfdff4fa9051b45467a28619610b Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Mon, 28 Dec 2020 10:50:32 +0800
Subject: [PATCH] =?UTF-8?q?DeletePolicyAndGroupObject=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E7=AD=96=E7=95=A5=E4=B8=BA=E7=A9=BA=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_bfapi/PolicyObject.robot | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/02-Keyword/tsg_bfapi/PolicyObject.robot b/02-Keyword/tsg_bfapi/PolicyObject.robot
index aa36f24..f3a0e8a 100644
--- a/02-Keyword/tsg_bfapi/PolicyObject.robot
+++ b/02-Keyword/tsg_bfapi/PolicyObject.robot
@@ -343,15 +343,19 @@ DeletePolicyAndGroupObject
     #删除策略
     log    toDeletePolicy_DeletePolicyAndObject
     ${listlenth}=    Get Length    ${policyids}
+    Run Keyword If    "${listlenth}"=="0"    log   no Policys to del
+    ...    ELSE    DeletePolicys    ${policyids}
+    #删除对象
+    log    todeleteobj_DeletePolicyAndObject
+    Run Keyword If    "${objectids}"=="${EMPTY}"    log   no Objects to del
+    ...    ELSE    DeleteGroupObjects    ${objectids}
+DeletePolicys
+    [Arguments]    ${policyids}
+    ${listlenth}=    Get Length    ${policyids}
     FOR    ${var}    IN RANGE    ${listlenth}
         log    ${var}
         DeletePolicy   ${policyids}[${var}]
     END
-    #删除对象
-    log    todeleteobj_DeletePolicyAndObject
-    Run Keyword If    "${objectids}"=="${EMPTY}"    log   no obj to del
-    ...    ELSE    DeleteGroupObjects    ${objectids}
-
 DeleteGroupObjects
      [Arguments]    ${objectids}
     FOR    ${var}    IN   @{objectids}