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

2 years ago · 3c048f0f54
parent 8a4b6aa45d e49c198e29
commit 3c048f0f54
1 changed files with 3 additions and 0 deletions
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@ -1330,6 +1330,9 @@
        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
            and t.bzdh = #{bzdh}
        </if>
+        <if test="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}
        </if>