Merge branch '0630-增加权限筛选' 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

@@ -220,6 +220,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
+<!--        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">-->
+<!--            order by t.qs_date desc,t.invoice_date desc-->
+<!--        </if>-->
+<!--        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">-->
+<!--            order by t.invoice_date desc-->
+<!--        </if>-->
         <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
             and t.tax_rate = #{taxRate}
         </if>
@@ -244,13 +250,6 @@
         <if test="sortKprq == 2">
             order by t.invoice_date desc
         </if>
-        <!--limit #{curr},#{size}-->
-<!--        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">-->
-<!--            order by t.qs_date desc,t.invoice_date desc-->
-<!--        </if>-->
-<!--        <if test="qsksrq==null or qsksrq=='' or qsjsrq==null or qsjsrq==''">-->
-<!--            order by t.invoice_date desc-->
-<!--        </if>-->
     </select>
     <select id="selectDksh" parameterType="java.util.Map"
             resultType="com.dxhy.base.entity.BaseTDxDkCount"
@@ -580,7 +579,6 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        order by t.bzdh desc
     </select>
 
     <select id="selectHj" parameterType="java.util.Map"