From 3718b285b759120dc826a7c54747db7f57533e62 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Fri, 17 Jul 2020 18:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2fields?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 02-Keyword/tsg_bfapi/policy_object/Log.robot | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/02-Keyword/tsg_bfapi/policy_object/Log.robot b/02-Keyword/tsg_bfapi/policy_object/Log.robot
index 94881ab..1c77c69 100644
--- a/02-Keyword/tsg_bfapi/policy_object/Log.robot
+++ b/02-Keyword/tsg_bfapi/policy_object/Log.robot
@@ -46,16 +46,21 @@ QueryLogs
     #处理排序
     ${return}    ${orderBy}    Run Keyword And Ignore Error    Get From Dictionary    ${params}    orderBy
     ${orderBy}    Run Keyword If    "${return}"=="FAIL" or "${orderBy}"=="${EMPTY}"   Create List
-    ...    ELSE IF    "${path}"=="list" or "${path}"=="batch"    ManageOrderBy    ${orderBy}    ELSE IF    "${path}"=="count"
-    ...    Set Variable    ${orderBy}
+    ...    ELSE IF    "${path}"=="list" or "${path}"=="batch"    ManageOrderBy    ${orderBy}
+    ...    ELSE IF    "${path}"=="count"    Set Variable    ${orderBy}
+    
     Run Keyword If    "${path}"=="list" or "${path}"=="batch"    Set To Dictionary    ${params}   orderBy=${orderBy} 
     Run Keyword If    "${path}"=="count"    Remove From Dictionary    ${params}   orderBy
+    
     ${return}    ${fields}    Run Keyword And Ignore Error    Get From Dictionary    ${params}    fields
+    ${fields}    Run Keyword If    "${return}"=="FAIL"    Set Variable     ${EMPTY}
+    ...    ELSE    Set Variable    ${fields}
     Run Keyword If    "${path}"=="list"    Should Not Be Empty    ${fields}
     ${fields}   Run Keyword If    "${path}"=="list" or "${path}"=="batch"    ManageFields     ${fields}
     ...    ELSE    Create List
     Run Keyword If    "${path}"=="list" or "${path}"=="batch"    Set To Dictionary    ${params}   fields=${fields}
     Run Keyword If    "${path}"=="count"    Remove From Dictionary    ${params}   fields
+    
     ${start_common_recv_time}    Get From Dictionary    ${params}    start_common_recv_time
     Should Not Be Empty    ${start_common_recv_time}
     ${end_common_recv_time}    Get From Dictionary    ${params}    end_common_recv_time
@@ -78,7 +83,7 @@ QueryLogs
     [Return]    ${resData}
  ManageOrderBy
     [Documentation]
-    ... 处理 order by
+    ...    处理 order by
     [Arguments]    ${orderBy}
     ${orderByList}    Create List
     @{orderByArr}    Split String    ${orderBy}    ,
@@ -95,11 +100,11 @@ QueryLogs
     ${fieldsList}    Create List
     @{fieldsArr}    Split String    ${fields}    ,
     FOR    ${field}    IN    @{fieldsArr}
-        @{fieldsArr}    Split String    ${field}    |
-        ${dict}    Create Dictionary    name=${fieldsArr}[0]    type=${fieldsArr}[1]
-        ${len}    Get Length    ${fieldsArr}
+        @{fieldArr}    Split String    ${field}    |
+        ${dict}    Create Dictionary    name=${fieldArr}[0]    type=${fieldArr}[1]
+        ${len}    Get Length    ${fieldArr}
         # batch时有lang字段
-        Run Keyword If    ${len}==3    Set To Dictionary    ${dict}    lang=${fieldsArr}[2]
+        Run Keyword If    ${len}==3    Set To Dictionary    ${dict}    lang=${fieldArr}[2]
         Append To List    ${fieldsList}    ${dict}
     END
     [Return]    ${fieldsList}