diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 08f4203da..0a0a6ef0f 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -57,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectEmisSettleInvoiceChRecordList" parameterType="EmisSettleInvoiceChRecord" resultMap="EmisSettleInvoiceChRecordResult">
-        <include refid="selectEmisSettleInvoiceChRecordVo"/>
+        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, saler_checker, saler_payee, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_settle_invoice_ch_record a
         <where>  
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
@@ -114,6 +115,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
             <if test="params.billCode != null and params.billCode != ''">
+                and EXISTS(
+                    select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3,emis_settle_sub_bill x4
+                    where x2.del_flag = '0' and x3.del_flag = '0' and x4.del_flag='0'
+                    and  a.apply_seq_no=x3.apply_seq_no
+                    and x2.settle_bill_no=x3.settle_bill_no
+                    and x4.settle_bill_no=x2.settle_bill_no
+                    and FIND_IN_SET(x4.`bill_code`,#{params.billCode})
+                )
+                <!--
                 AND apply_seq_no IN (
                  SELECT  x1.apply_seq_no FROM
                     emis_settle_invoice_record x1,
@@ -128,20 +138,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') )
                     )
                 )
+                -->
             </if>
 
             <if test="params.settleBillNo != null and params.settleBillNo != ''">
+                <!--
                 AND apply_seq_no IN (
                     SELECT  x1.apply_seq_no FROM emis_settle_invoice_record x1,emis_settle_bill x2
                     WHERE x1.del_flag = '0' AND x2.del_flag = '0'
                         AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
                         AND x2.settle_bill_no=#{params.settleBillNo}
                 )
+                -->
+                and EXISTS(
+                    select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3
+                    where x2.del_flag = '0' and x3.del_flag = '0'
+                    and  a.apply_seq_no=x3.apply_seq_no and x2.settle_bill_no=x3.settle_bill_no
+                )
             </if>
 
 
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and EXISTS(
+                    select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3
+                    where x2.del_flag = '0' and x3.del_flag = '0'
+                    and  a.apply_seq_no=x3.apply_seq_no and x2.settle_bill_no=x3.settle_bill_no
+                    AND (
+                        x2.salesmen = #{params.privEmpName}
+                        OR x2.payee = #{params.privEmpName}
+                        OR x2.salesmen IN (
+                        SELECT salesmen
+                            FROM emis_salesmen_rel  esr
+                            where esr.del_flag='0' and  esr.bl_open='1'
+                            and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date
+                            and esr.sales_ass = #{params.privEmpName}
+                        )
+                    )
+                )
+
+                <!--
                 AND apply_seq_no IN (
                     SELECT  x1.apply_seq_no FROM
                     emis_settle_invoice_record x1,
@@ -155,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                 or b.salesmen in(select salesmen from emis_salesmen_rel esr where esr.del_flag='0' and  esr.bl_open='1' and now() <![CDATA[ >= ]]> esr.start_date and now() <![CDATA[ <= ]]> esr.end_date and esr.sales_ass=#{params.privEmpName})
                             )
                     )
-                )
+                ) -->
             </if>
 
         </where>
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index c54722bfc..12686d564 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and trade_date <![CDATA[ <= ]]>  #{params.endTradeDate}
             </if>
 
-            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+            <if test="params.billCode != null and params.billCode != ''">
                 and settle_bill_no in(
                     select bill_no from emis_settle_sub_bill b
                     where del_flag='0'
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
index 85cbca2fd..f5af1f9f5 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
@@ -76,14 +76,7 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    site_code in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                    site_code=#{params.privSiteCode}
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml
index c9cfe373e..16e726b3b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml
@@ -79,14 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                        send_site_code in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                        send_site_code=#{params.privSiteCode}
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
index 48f452e72..90af1f7cc 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
@@ -66,14 +66,7 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                     create_site in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                     create_site= #{params.privSiteCode}
                 )
             </if>
         </where>
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
index 0977e4a89..09c8c9c9b 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
@@ -104,23 +104,9 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    send_stite_code in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                    send_stite_code=#{params.privSiteCode}
                     or
-                    create_site in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                    create_site=#{params.privSiteCode}
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 2ad466064..3c6facb48 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -150,23 +150,9 @@
 
                     <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                         and (
-                            b.dispatch_underling_site_code in (
-                                SELECT t1.site_code FROM (
-                                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                                #{params.privSiteCode} ) pd
-                                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                                UNION
-                                SELECT #{params.privSiteCode} FROM dual
-                            )
+                            b.dispatch_underling_site_code=#{params.privSiteCode}
                             or
-                            b.send_site_code in (
-                                SELECT t1.site_code FROM (
-                                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                                #{params.privSiteCode} ) pd
-                                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                                UNION
-                                SELECT #{params.privSiteCode} FROM dual
-                            )
+                            b.send_site_code=#{params.privSiteCode}
                         )
                     </if>
             )
@@ -199,14 +185,7 @@
             <if test="params.beginScanDate != null and params.beginScanDate != ''">and  a.scan_date <![CDATA[ >= ]]>  #{params.beginScanDate}</if>
             <if test="params.endScanDate != null and params.endScanDate != ''">and  a.scan_date <![CDATA[ <= ]]>  #{params.endScanDate}</if>
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-                and  a.scan_site_code in (
-                SELECT t1.site_code FROM (
-                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                #{params.privSiteCode} ) pd
-                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                UNION
-                SELECT #{params.privSiteCode} FROM dual
-                )
+                and  a.scan_site_code=#{params.privSiteCode}
             </if>
         ) tbA
         GROUP BY tbA.scan_site_code
@@ -393,14 +372,7 @@
             </if>
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-                and scan_site_code in (
-                    SELECT t1.site_code FROM (
-                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                    #{params.privSiteCode} ) pd
-                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                    UNION
-                    SELECT #{params.privSiteCode} FROM dual
-                )
+                and scan_site_code=#{params.privSiteCode}
             </if>
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index 22e4f96a6..685574230 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -118,23 +118,8 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                start_site_code in (
-                    SELECT t1.site_code FROM (
-                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                    #{params.privSiteCode} ) pd
-                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                    UNION
-                    SELECT #{params.privSiteCode} FROM dual
-                )
-                or
-                create_site in (
-                    SELECT t1.site_code FROM (
-                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                    #{params.privSiteCode} ) pd
-                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                    UNION
-                    SELECT #{params.privSiteCode} FROM dual
-                )
+                start_site_code=#{params.privSiteCode}
+                or create_site=#{params.privSiteCode}
              )
             </if>
         </where>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
index ee77ad05d..11987a6a3 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
@@ -129,23 +129,9 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    apply_site_code in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                   )
+                    apply_site_code=#{params.privSiteCode}
                    or
-                    dest_confirm_site_code in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                  )
+                    dest_confirm_site_code=#{params.privSiteCode}
                 )
             </if>
         </where>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index b48f89dba..9ae4e7d96 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -54,14 +54,7 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    create_site in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                    create_site=#{params.privSiteCode}
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
index 42a4ba40a..a7dd5decf 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
@@ -64,14 +64,7 @@
             </if>
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                a.send_site_code in (
-                    SELECT t1.site_code FROM (
-                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                    #{params.privSiteCode} ) pd
-                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                    UNION
-                    SELECT #{params.privSiteCode} FROM dual
-                )
+                a.send_site_code=#{params.privSiteCode}
              )
             </if>
         </where>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillDeclareAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillDeclareAttachmentMapper.xml
index 9e5cc53cf..fc7b5dd18 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillDeclareAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillDeclareAttachmentMapper.xml
@@ -64,14 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                create_site in (
-                SELECT t1.site_code FROM (
-                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                #{params.privSiteCode} ) pd
-                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                UNION
-                SELECT #{params.privSiteCode} FROM dual
-                )
+                    create_site=#{params.privSiteCode}
                 )
             </if>
         </where>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index b45db4448..e2f4ed849 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -93,23 +93,9 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    register_site_code in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                    register_site_code=#{params.privSiteCode}
                     or
-                    send_site_code in (
-                            SELECT t1.site_code FROM (
-                            SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                            #{params.privSiteCode} ) pd
-                            WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                            UNION
-                            SELECT #{params.privSiteCode} FROM dual
-                    )
+                    send_site_code=#{params.privSiteCode}
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
index 73b10fa3a..bb58ea2bc 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
@@ -70,14 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    create_site in (
-                        SELECT t1.site_code FROM (
-                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                        #{params.privSiteCode} ) pd
-                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                        UNION
-                        SELECT #{params.privSiteCode} FROM dual
-                    )
+                    create_site=#{params.privSiteCode}
                 )
             </if>