From d9ebf26430adaa68c6f9cae7d1861135a724b7b6 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 1 May 2019 14:39:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BA=8C=E7=BA=A7=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=89=E7=BA=A7=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/static/payment/tradelog/transflow.js   | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/main/ui/static/payment/tradelog/transflow.js b/src/main/ui/static/payment/tradelog/transflow.js
index 9f77fbe70..03036867f 100644
--- a/src/main/ui/static/payment/tradelog/transflow.js
+++ b/src/main/ui/static/payment/tradelog/transflow.js
@@ -25,27 +25,6 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
         $scope.params.client_ids = [$scope.currentUser.client.client_id];
         $scope.showLevel3Clients = false;
 
-        if ($scope.currentUser.client.has_children) {
-            $http.get('/client/partner_info/sub_partners').then(function (resp) {
-                var clientList = resp.data;
-                clientList.forEach(function (client) {
-                    $scope.clients.push(client);
-                });
-                $scope.clientIds = [];
-                $scope.clients.forEach(function (client) {
-                    $scope.clientIds.push(client.client_id);
-                    if (client.level3Clients) {
-                        client.level3Clients.forEach(function (level3Client) {
-                            $scope.clientIds.push(level3Client.client_id);
-                        });
-                    }
-                });
-                $scope.params.client_ids = angular.copy($scope.clientIds);
-                $scope.chooseLast7Days();
-            })
-        }else {
-            $scope.chooseLast7Days();
-        }
         $scope.today = new Date();
         $scope.chooseToday = function () {
             $scope.params.datefrom = $scope.params.dateto = new Date();
@@ -211,7 +190,27 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             return url;
 
         }
-
+        if ($scope.currentUser.client.has_children) {
+            $http.get('/client/partner_info/sub_partners').then(function (resp) {
+                var clientList = resp.data;
+                clientList.forEach(function (client) {
+                    $scope.clients.push(client);
+                });
+                $scope.clientIds = [];
+                $scope.clients.forEach(function (client) {
+                    $scope.clientIds.push(client.client_id);
+                    if (client.level3Clients) {
+                        client.level3Clients.forEach(function (level3Client) {
+                            $scope.clientIds.push(level3Client.client_id);
+                        });
+                    }
+                });
+                $scope.params.client_ids = angular.copy($scope.clientIds);
+                $scope.chooseLast7Days();
+            })
+        }else {
+            $scope.chooseLast7Days();
+        }
     }]);
 
     return app;