Merge branch '0614-增加税率筛选条件' of http://192.168.12.182/invoice/pt into test

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

@@ -1093,10 +1093,10 @@
             and t.bzr like concat('%',#{bzr},'%')
         </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
-            and t.bzdh is not null and t.inaccount_status = '1'
+            and t.bzdh = #{bzdh}
         </if>
         <if test="bzdh  == ''">
-            and t.bzdh = #{bzdh}
+            and t.bzdh is not null and t.inaccount_status = '1'
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}