仓储费仓库单选查询非空条件

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -469,9 +469,9 @@
             wh.f_corpid = #{warehouse.fCorpid}
             and ware.f_charg = 1
             and wh.f_chargedate < #{warehouse.fBillingDeadline}
-            <if test="warehouse.fGoodsid != null">and wh.f_goodsid = #{warehouse.fGoodsid}</if>
-            <if test="warehouse.fMblno != null">and wh.f_mblno = #{warehouse.fMblno}</if>
-            <if test="warehouse.fWarehouseid != null">and wh.f_warehouseid = #{warehouse.fWarehouseid}</if>
+            <if test="warehouse.fGoodsid != null and warehouse.fGoodsid != ''">and wh.f_goodsid = #{warehouse.fGoodsid}</if>
+            <if test="warehouse.fMblno != null and warehouse.fMblno != ''">and wh.f_mblno = #{warehouse.fMblno}</if>
+            <if test="warehouse.fWarehouseid != null and warehouse.fWarehouseid != ''">and wh.f_warehouseid = #{warehouse.fWarehouseid}</if>
         </where>
     </select>