From 4fda855c3c6b690392157be54586e19e1a284ca1 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Fri, 12 Mar 2021 18:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/BUI_PUB_CTL.XML              |   8 +-
 bui/etc/cap/OBUICAP1/0040002_CTL.XML |   4 +-
 bui/etc/cap/OBUICAP1/2040801_CTL.XML | 195 ++++++++++++++-------------
 bui/etc/cap/OBUICAP1/2040818_CTL.XML |   4 +-
 bui/etc/cap/OBUICAP1/2040859_CTL.XML |  10 +-
 bui/etc/cap/OBUICAP1/2040860_CTL.XML |   4 +-
 bui/etc/cap/OBUICAP1/2040882_CTL.XML |  41 ++++++
 bui/etc/cap/OBUICAP1_CTL.XML         |   1 +
 bui/etc/cap/SCAHRO1_ATR.XML          |   1 +
 9 files changed, 164 insertions(+), 104 deletions(-)
 create mode 100644 bui/etc/cap/OBUICAP1/2040882_CTL.XML

diff --git a/bui/etc/BUI_PUB_CTL.XML b/bui/etc/BUI_PUB_CTL.XML
index 54c86f5..2479de4 100644
--- a/bui/etc/BUI_PUB_CTL.XML
+++ b/bui/etc/BUI_PUB_CTL.XML
@@ -96,18 +96,18 @@
                      <Arg name="MsgCd"   value="CAP00028"/>
                      <Arg name="MsgDat"  value="鉴权失败"/>
                   </Exec>
-                  <!--Exit/-->
+                  <Exit/>
                </If>
                
                <!--第三方返回为空时 说明无权限-->
-               <Set>FUNCSET=$FUNCSET</Set>
+               <!--Set>FUNCSET=$FUNCSET</Set>
                <If condition="ISNULL($FUNCSET)">
                   <Exec func="PUB:GWASetMsg">
                      <Arg name="MsgCd"   value="CAP10021"/>
                      <Arg name="MsgDat"  value="无权限"/>
                   </Exec>
-                  <!--Exit/-->
-               </If>
+                  <Exit/>
+               </If-->
                
 
             </If>
diff --git a/bui/etc/cap/OBUICAP1/0040002_CTL.XML b/bui/etc/cap/OBUICAP1/0040002_CTL.XML
index 43ab53d..5b78407 100644
--- a/bui/etc/cap/OBUICAP1/0040002_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/0040002_CTL.XML
@@ -3,10 +3,10 @@
    <Transaction code='0040002' log_switch='1' desc='批量路由规则信息修改'>
       <DynSentence name='CMMTRTRULEINFO_UPD'>
          <Sentence>
-            UPDATE  CMMTEMRULE_BATCH SET RUL_LVL = ? , TRA_CD = ? , YMCC_CD = ? , RARD_CD = ? , CRD_FLG = ? , BNK_TYP = ? , BNK_NM = ? , ATM_LOW = ? , ATM_UP = ? , DAT_LOW = ? , DAT_UP = ? , TIM_LOW = ? , TIM_UP = ? , CORG_NO = ? , CORG_NM = ? , RUL_STS = ? , TM_SMP = ? , WEIGHT = ? , ROUT_FLG = ? , GRP_NM = ?
+            UPDATE  CMMTEMRULE_BATCH SET RUL_LVL = ? , TRA_CD = ? , YMCC_CD = ? , RARD_CD = ? , CRD_FLG = ? , BNK_TYP = ? , BNK_NM = ? , ATM_LOW = ? , ATM_UP = ? , DAT_LOW = ? , DAT_UP = ? , TIM_LOW = ? , TIM_UP = ? , CORG_NO = ? , CORG_NM = ? , RUL_STS = ? , TM_SMP = ? , WEIGHT = ? , ROUT_FLG = ? , GRP_NM = ?,SKIP_HLD=?
             WHERE RUL_NO = ?
          </Sentence>
-         <Fields>RUL_LVL|TRA_CD|YMCC_CD|RARD_CD|CRD_FLG|BNK_TYP|BNK_NM|ATM_LOW|ATM_UP|DAT_LOW|DAT_UP|TIM_LOW|TIM_UP|CORG_NO|CORG_NM|RUL_STS|TM_SMP|WEIGHT|ROUT_FLG|GRP_NM|RUL_NO|</Fields>
+         <Fields>RUL_LVL|TRA_CD|YMCC_CD|RARD_CD|CRD_FLG|BNK_TYP|BNK_NM|ATM_LOW|ATM_UP|DAT_LOW|DAT_UP|TIM_LOW|TIM_UP|CORG_NO|CORG_NM|RUL_STS|TM_SMP|WEIGHT|ROUT_FLG|GRP_NM|SKIP_HLD|RUL_NO|</Fields>
       </DynSentence>
       <FlowCtrl>
          <Set>TM_SMP=GETDATETIME()</Set>
diff --git a/bui/etc/cap/OBUICAP1/2040801_CTL.XML b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
index e801fb3..91263eb 100644
--- a/bui/etc/cap/OBUICAP1/2040801_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
@@ -1,142 +1,157 @@
 <?xml version="1.0" encoding='UTF-8'?>
 <Root><!--商户交易查询-->
-   <Transaction code="2040801" log_switch="1">   
+   <Transaction code="2040801" log_switch="1">
 
-	  <DynSentence name="QRY_CAPTXNJNL_A">   <!--查询全部状态-->   
+      <DynSentence name="QRY_CAPTXNJNL_A">   <!--查询全部状态-->
          <Sentence>
-         SELECT J.*,M.CUSTOMER_NAME MERC_CNM  FROM  CAPTXNJNL J  left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID   where
-           ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
-           AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
-           AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')           
-           AND ('%s' IS NULL OR J.TXN_MOD = '%s')
-           AND ('%s' IS NULL OR J.ORD_TYP = '%s')
-           AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
-           AND ('%s' IS NULL OR J.TXN_CNL = '%s')           
-           AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
-		   AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
+            SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC  FROM  CAPTXNJNL J
+            left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID
+            left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM
+            where
+            ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
+            AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
+            AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.TXN_MOD = '%s')
+            AND ('%s' IS NULL OR J.ORD_TYP = '%s')
+            AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
+            AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
+            AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
          <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
-      
-     <DynSentence name="QRY_CAPTXNJNL_S">   <!--查询成功状态-->   
+
+      <DynSentence name="QRY_CAPTXNJNL_S">   <!--查询成功状态-->
          <Sentence>
-         SELECT J.*,M.CUSTOMER_NAME MERC_CNM  FROM  CAPTXNJNL J  left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID   where
-           ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
-           AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
-           AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
-           AND (J.TXN_STS = 'S')
-           AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.TXN_MOD = '%s')
-           AND ('%s' IS NULL OR J.ORD_TYP = '%s')
-           AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s') 
-           AND ('%s' IS NULL OR J.TXN_CNL = '%s')  
-           AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
-		   AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
+            SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC  FROM  CAPTXNJNL J
+            left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID
+            left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM
+            where
+            ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
+            AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
+            AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
+            AND (J.TXN_STS = 'S')
+            AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.TXN_MOD = '%s')
+            AND ('%s' IS NULL OR J.ORD_TYP = '%s')
+            AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
+            AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
+            AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
          <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
-  
-  	  <DynSentence name="QRY_CAPTXNJNL_F">   <!-- 查询失败状态 -->   
+
+      <DynSentence name="QRY_CAPTXNJNL_F">   <!-- 查询失败状态 -->
          <Sentence>
-        SELECT J.*,M.CUSTOMER_NAME MERC_CNM  FROM  CAPTXNJNL J  left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID   where
-           ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
-           AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
-           AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
-           AND ( J.TXN_STS = 'F')
-           AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.TXN_MOD = '%s')
-           AND ('%s' IS NULL OR J.ORD_TYP = '%s')
-           AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
-           AND ('%s' IS NULL OR J.TXN_CNL = '%s')   
-           AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
-		   AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
+            SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC  FROM  CAPTXNJNL J
+            left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID
+            left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM
+            where
+            ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
+            AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
+            AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
+            AND ( J.TXN_STS = 'F')
+            AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.TXN_MOD = '%s')
+            AND ('%s' IS NULL OR J.ORD_TYP = '%s')
+            AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
+            AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
+            AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
          <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
-      
-      <DynSentence name="QRY_CAPTXNJNL_U">   <!-- 查询预计状态 -->   
+
+      <DynSentence name="QRY_CAPTXNJNL_U">   <!-- 查询预计状态 -->
          <Sentence>
-        SELECT J.*,M.CUSTOMER_NAME MERC_CNM  FROM  CAPTXNJNL J  left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID   where
-           ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
-           AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
-           AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
-           AND ( J.TXN_STS = 'U')
-           AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.TXN_MOD = '%s')
-           AND ('%s' IS NULL OR J.ORD_TYP = '%s')
-           AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s') 
-           AND ('%s' IS NULL OR J.TXN_CNL = '%s')   
-           AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
-		   AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
+            SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC  FROM  CAPTXNJNL J
+            left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID
+            left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM
+            where
+            ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
+            AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
+            AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
+            AND ( J.TXN_STS = 'U')
+            AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.TXN_MOD = '%s')
+            AND ('%s' IS NULL OR J.ORD_TYP = '%s')
+            AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
+            AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
+            AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
          <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
-      
-      
-      <DynSentence name="QRY_CAPTXNJNL_PT">   <!-- 查询超时/处理中状态 -->   
+
+
+      <DynSentence name="QRY_CAPTXNJNL_PT">   <!-- 查询超时/处理中状态 -->
          <Sentence>
-        SELECT J.*,M.CUSTOMER_NAME MERC_CNM  FROM  CAPTXNJNL J  left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID   where
-           ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
-           AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
-           AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
-           AND ( J.TXN_STS = 'P' OR J.TXN_STS = 'T')
-           AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
-           AND ('%s' IS NULL OR J.TXN_MOD = '%s')
-           AND ('%s' IS NULL OR J.ORD_TYP = '%s')
-           AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s') 
-           AND ('%s' IS NULL OR J.TXN_CNL = '%s') 
-           AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
-		   AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
+            SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC  FROM  CAPTXNJNL J
+            left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID
+            left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM
+            where
+            ('%s' IS NULL OR J.MERC_ID LIKE '%s%')
+            AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%')
+            AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%')
+            AND ( J.TXN_STS = 'P' OR J.TXN_STS = 'T')
+            AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%')
+            AND ('%s' IS NULL OR J.TXN_MOD = '%s')
+            AND ('%s' IS NULL OR J.ORD_TYP = '%s')
+            AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
+            AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
+            AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
          <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
       <FlowCtrl>
-         
+
          <If condition="IS_EQUAL_STRING($TXN_STS,S)">
-             <Set>QRY_SQL=QRY_CAPTXNJNL_S</Set>
+            <Set>QRY_SQL=QRY_CAPTXNJNL_S</Set>
          </If>
          <ElseIf condition="IS_EQUAL_STRING($TXN_STS,U)">
-             <Set>QRY_SQL=QRY_CAPTXNJNL_U</Set>
+            <Set>QRY_SQL=QRY_CAPTXNJNL_U</Set>
          </ElseIf>
          <ElseIf condition="IS_EQUAL_STRING($TXN_STS,F)">
-             <Set>QRY_SQL=QRY_CAPTXNJNL_F</Set>
+            <Set>QRY_SQL=QRY_CAPTXNJNL_F</Set>
          </ElseIf>
          <ElseIf condition="IS_EQUAL_STRING($TXN_STS,PT)">
-             <Set>QRY_SQL=QRY_CAPTXNJNL_PT</Set>
+            <Set>QRY_SQL=QRY_CAPTXNJNL_PT</Set>
          </ElseIf>
          <Else>
-             <Set>QRY_SQL=QRY_CAPTXNJNL_A</Set>
+            <Set>QRY_SQL=QRY_CAPTXNJNL_A</Set>
          </Else>
-         
+
          <!--交易记录查询-->
          <Exec func="PUB:DBMultiQueryPage" >
             <Arg name="PageNo" value="$PAG_NO"/>
             <Arg name="SqlCmd" value="$QRY_SQL"/>
             <Arg name="RecNumPerPage" value="$PAG_NUM"/>
          </Exec>
-         <If condition="~RetCod=2">                 
+         <If condition="~RetCod=2">
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CMM20300" />
                <!--Arg name="MsgDat" value="交易记录不存在"/-->
             </Exec>
             <Return/>
          </If>
-		   
+
          <Exec func="PUB:GWASetMsg">
             <Arg name="MsgCd" value="CAP00000" />
          </Exec>
-         
+
       </FlowCtrl>
    </Transaction>
 
diff --git a/bui/etc/cap/OBUICAP1/2040818_CTL.XML b/bui/etc/cap/OBUICAP1/2040818_CTL.XML
index e7c6f2e..7b66bf7 100644
--- a/bui/etc/cap/OBUICAP1/2040818_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040818_CTL.XML
@@ -4,7 +4,9 @@
 
 	  <DynSentence name="QRY_CAPBATINF">   <!--代收代付接出批量信息-->   
          <Sentence>
-            select * from CAPBATINF where 
+            select A.*,B.DISK_DESC from CAPBATINF 
+             left join CAPDSKINF B on B.DSK_NAM=A.DSK_NAM
+             where  
             ('%s' IS NULL OR MERC_ID LIKE '%s%')
             AND ('%s' IS NULL OR CORG_NO LIKE '%s%')
             AND ('%s' IS NULL OR CORG_NO_NM LIKE '%s%')
diff --git a/bui/etc/cap/OBUICAP1/2040859_CTL.XML b/bui/etc/cap/OBUICAP1/2040859_CTL.XML
index ecf745f..ad968d6 100644
--- a/bui/etc/cap/OBUICAP1/2040859_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040859_CTL.XML
@@ -5,11 +5,11 @@
 
 	  <DynSentence name="QRY_CAPACCOUNTINF">   <!--支付地抬头信息查询-->   
          <Sentence>
-            select * from CAPACCOUNTINF where 
-            ('%s' IS NULL OR TITLE_ID LIKE '%%s%')
-            AND ('%s' IS NULL OR TITLE_NAME LIKE '%%s%')
-            AND ('%s' IS NULL OR ACCT_TYPE = '%s')
-            AND ('%s' IS NULL OR ACCT_NO LIKE '%%s%')
+            select A.*,B.CORG_NM from CAPACCOUNTINF A left join CMMTORGN B on B.CORP_ORG=A.BANK_CODE 
+             where ('%s' IS NULL OR A.TITLE_ID LIKE '%%s%')
+            AND ('%s' IS NULL OR A.TITLE_NAME LIKE '%%s%')
+            AND ('%s' IS NULL OR A.ACCT_TYPE = '%s')
+            AND ('%s' IS NULL OR A.ACCT_NO LIKE '%%s%')
          </Sentence>
          <Fields>TITLE_ID|TITLE_ID|TITLE_NAME|TITLE_NAME|ACCT_TYPE|ACCT_TYPE|ACCT_NO|ACCT_NO|</Fields>
       </DynSentence>
diff --git a/bui/etc/cap/OBUICAP1/2040860_CTL.XML b/bui/etc/cap/OBUICAP1/2040860_CTL.XML
index e91a2da..03db5a4 100644
--- a/bui/etc/cap/OBUICAP1/2040860_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040860_CTL.XML
@@ -24,13 +24,13 @@
                   
          <!--第三方返回为空时 说明无权限-->
          <Set>FUNCSET=$FUNCSET</Set>
-         <If condition="ISNULL($FUNCSET)">
+         <!--If condition="ISNULL($FUNCSET)">
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd"   value="CAP10021"/>
                <Arg name="MsgDat"  value="无权限"/>
             </Exec>
             <Return/>
-         </If>
+         </If-->
           
 
          <Exec func="PUB:DumpETF" />
diff --git a/bui/etc/cap/OBUICAP1/2040882_CTL.XML b/bui/etc/cap/OBUICAP1/2040882_CTL.XML
new file mode 100644
index 0000000..5886607
--- /dev/null
+++ b/bui/etc/cap/OBUICAP1/2040882_CTL.XML
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<Root>
+   <!--组信息多页查询-->
+   <Transaction code="2040882" log_switch="1">
+
+      <DynSentence name="QRY_CMMTRTRGRP_INF">   <!--组信息查询 查询具体待定-->
+         <Sentence>
+            SELECT  * FROM CMMTRTRGRP WHERE (GRP_NM LIKE '%%s%' OR '%s' IS NULL) AND (GRP_DSC LIKE '%%s%' OR '%s' IS NULL)
+         </Sentence>
+         <Fields>GRP_NM|GRP_NM|GRP_DSC|GRP_DSC|</Fields>         
+      </DynSentence>
+      
+      <FlowCtrl>
+
+         <!--交易记录查询-->
+         <Exec func="PUB:DBMultiQueryPage" >
+            <Arg name="PageNo" value="$PAG_NO"/>
+            <Arg name="SqlCmd" value="QRY_CMMTRTRGRP_INF"/>
+            <Arg name="RecNumPerPage" value="$PAG_NUM"/>
+         </Exec>
+         <If condition="~RetCod=2">                 
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00000" />
+            </Exec>
+            <Return/>
+         </If>
+         <ElseIf condition="~RetCod=-1">                 
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00021" />
+            </Exec>
+            <Return/>
+         </ElseIf>         
+		    <Exec func="PUB:DumpETF" />
+         <Exec func="PUB:GWASetMsg">
+            <Arg name="MsgCd" value="CAP00000" />
+         </Exec>
+
+      </FlowCtrl>
+   </Transaction>
+
+</Root>
diff --git a/bui/etc/cap/OBUICAP1_CTL.XML b/bui/etc/cap/OBUICAP1_CTL.XML
index 32c54bd..916e1b7 100644
--- a/bui/etc/cap/OBUICAP1_CTL.XML
+++ b/bui/etc/cap/OBUICAP1_CTL.XML
@@ -142,5 +142,6 @@
    <Include file="etc/cap/OBUICAP1/2040879_CTL.XML" />  <!-- 客户风控规则新增 -->  
    <Include file="etc/cap/OBUICAP1/2040880_CTL.XML" />  <!-- 客户风控规则解除 -->  
    <Include file="etc/cap/OBUICAP1/2040881_CTL.XML" />  <!-- 客户登记下拉列表查询 -->  
+   <Include file="etc/cap/OBUICAP1/2040882_CTL.XML" />  <!-- 组信息多页查询 -->  
    
 </Application>
diff --git a/bui/etc/cap/SCAHRO1_ATR.XML b/bui/etc/cap/SCAHRO1_ATR.XML
index a613926..ed50dd4 100644
--- a/bui/etc/cap/SCAHRO1_ATR.XML
+++ b/bui/etc/cap/SCAHRO1_ATR.XML
@@ -7,6 +7,7 @@
       <Param name="method" value="GET" />
       <Param name="key" value="7nEBaDBay2vNKXnWBQqSRZX8wEK3iVOP" />
       <Param name="tmOut"  value="3" />
+      <Param name="charSet"  value="UTF-8" />
       <Param name="contentType"  value="application/x-www-form-urlencoded" />
    </Declare>