Merge branches '0630-增加权限筛选' and 'test' of http://192.168.12.182/invoice/pt into test

 Conflicts:

	dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -251,24 +251,6 @@
 <!--        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">-->
 <!--            order by t.invoice_date desc-->
 <!--        </if>-->
-        <if test="sortPzbh == 1">
-            order by t.sn_voucher_number
-        </if>
-        <if test="sortPzbh == 2">
-            order by t.sn_voucher_number desc
-        </if>
-        <if test="sortBzdh == 1">
-            order by t.bzdh
-        </if>
-        <if test="sortBzdh == 2">
-            order by t.bzdh desc
-        </if>
-        <if test="sortKprq == 1">
-            order by t.invoice_date
-        </if>
-        <if test="sortKprq == 2">
-            order by t.invoice_date desc
-        </if>
     </select>
     <select id="selectDksh" parameterType="java.util.Map"
             resultType="com.dxhy.base.entity.BaseTDxDkCount"
@@ -598,30 +580,7 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
-            and t.tax_rate = #{taxRate}
-        </if>
-        <if test="taxRate=='多税率'">
-            and t.tax_rate like '%,%'
-        </if>
-        <if test="sortPzbh == '1'">
-            order by t.sn_voucher_number desc
-        </if>
-        <if test="sortPzbh == '2'">
-            order by t.sn_voucher_number
-        </if>
-        <if test="sortBzdh == '1'">
-            order by t.bzdh desc
-        </if>
-        <if test="sortBzdh == '2'">
-            order by t.bzdh
-        </if>
-        <if test="sortKprq == '1'">
-            order by t.invoice_date desc
-        </if>
-        <if test="sortKprq == '2'">
-            order by t.invoice_date
-        </if>
+        order by t.bzdh desc
     </select>
 
     <select id="selectHj" parameterType="java.util.Map"