2023年1月10日10:24:59

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -814,7 +814,7 @@
                 #{map.tWareHouseFees.fToCorpid}
             </if>
             <if test="map.tWareHouseFees.fTypeid != null ">and t.f_typeid = #{map.tWareHouseFees.fTypeid}</if>
-            <if test="map.tWareHouseFees.fTypeid == null ">and t.f_typeid IS NULL</if>
+            <if test="map.tWareHouseFees.fTypeid == null ">and (t.f_typeid IS NULL or t.f_typeid = '1') </if>
             <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and w.f_mblno like
                 concat('%', #{map.tWareHouseFees.fMblno}, '%')
             </if>
@@ -1355,7 +1355,7 @@
                 #{map.tWareHouseFees.fCorpid}
             </if>
             <if test="map.tWareHouseFees.fTypeid != null ">and t.f_typeid = #{map.tWareHouseFees.fTypeid}</if>
-            <if test="map.tWareHouseFees.fTypeid == null ">and t.f_typeid IS NULL</if>
+            <if test="map.tWareHouseFees.fTypeid == null ">and (t.f_typeid IS NULL or t.f_typeid = '1')</if>
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid =
                 #{map.tWareHouseFees.fToCorpid}
             </if>
@@ -2759,7 +2759,7 @@
                 #{map.tWareHouseFees.fCorpid}
             </if>
             <if test="map.tWareHouseFees.fTypeid != null ">and t.f_typeid = #{map.tWareHouseFees.fTypeid}</if>
-            <if test="map.tWareHouseFees.fTypeid == null ">and t.f_typeid IS NULL</if>
+            <if test="map.tWareHouseFees.fTypeid == null ">and (t.f_typeid IS NULL or t.f_typeid = '1') </if>
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid =
                 #{map.tWareHouseFees.fToCorpid}
             </if>