From fabbe46168a7aac37c4aeab49a7ff4b17662affb Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Wed, 29 Apr 2020 15:09:35 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=A1=E7=94=A8=E5=8D=A1=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mappers/system/ClientMapper.xml     | 18 ++++++------------
 .../partner/templates/partner_detail.html      |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index 15055ae5a..b752401ef 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -142,22 +142,16 @@
             </if>
 
             <if test="card_approving and approving">
-                OR (c.client_id NOT IN (
-                  SELECT client_id FROM sys_client_upay_profile
-                )
                 OR c.client_id IN (
-                  SELECT client_id FROM sys_client_upay_profile AS cardFlow
-                  WHERE cardFlow.upay_approve_result = 4 or upay_approve_result = 1
-                ))
+                  SELECT client_id FROM sys_client_upay_profile scup
+                  WHERE ((scup.upay_approve_result=4 and scup.upay_open_status is null) or scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4)
+                )
             </if>
             <if test="card_approving">
-                AND (c.client_id NOT IN (
-                  SELECT client_id FROM sys_client_upay_profile
+                AND c.client_id IN (
+                SELECT client_id FROM sys_client_upay_profile scup
+                WHERE ((scup.upay_approve_result=4 and scup.upay_open_status is null) or scup.upay_open_status=1 or scup.upay_open_status=2 or scup.upay_open_status=4)
                 )
-                OR c.client_id IN (
-                SELECT client_id FROM sys_client_upay_profile AS cardFlow
-                WHERE cardFlow.upay_approve_result = 4 or upay_approve_result = 1
-                ))
             </if>
             <if test="quickPass">
                 and c.source=4
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index 811b02888..6134cfec2 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -264,7 +264,7 @@
             </button>
         </div>
         <div class="box-body" ng-if="partner.is_valid==1">
-            <a ng-if="partner.upay_open_status != 5" role="button" type="button" class="btn btn-success" ng-click="exportCardAgreegatePDF()">
+            <a ng-if="partner.upay_open_status != 5 && partner.upay_open_status" role="button" type="button" class="btn btn-success" ng-click="exportCardAgreegatePDF()">
                 制作信用卡支付合同</a>
             <a ng-if="partner.upay_open_status != 5 &&letterOfOfferFileManager.letter_of_offer_file" role="button" type="button" class="btn btn-success" ng-click="exportCardPromotionaAgreegatePDF()">
                 制作促销合同</a>