导出和页面优化未认证和撤销认证查询条件

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

@@ -83,6 +83,13 @@
         <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
             and t.bdk_status in ('1','2')
         </if>
+        <if test="rzclzt != null and (rzclzt == '0'.toString() or rzclzt == '6'.toString())">
+            AND t.inaccount_status = '1'
+            AND t.rzh_yesorno = '0'
+            <if test=" bzdh == ''">
+                and t.bzdh is not null
+            </if>
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
@@ -368,6 +375,16 @@
         <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
             and t.bdk_status in ('1','2')
         </if>
+
+        <if test="rzclzt != null and (rzclzt == '0'.toString() or rzclzt == '6'.toString())">
+            AND t.inaccount_status = '1'
+            AND t.rzh_yesorno = '0'
+            <if test=" bzdh == ''">
+                and t.bzdh is not null
+            </if>
+        </if>
+
+
         <if  test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>

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

@@ -523,6 +523,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
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -115,6 +115,13 @@
         <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
             and t.bdk_status in ('1','2')
         </if>
+        <if test="rzclzt != null and (rzclzt == '0'.toString() or rzclzt == '6'.toString())">
+            AND t.inaccount_status = '1'
+            AND t.rzh_yesorno = '0'
+            <if test=" bzdh == ''">
+                and t.bzdh is not null
+            </if>
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>