Merge remote-tracking branch 'origin/2022-4-7'

# Conflicts: # jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
2022-04-12 15:45:24 +08:00
parent fa13cfa32a b967391e3c
commit 1208be79d4
3 changed files with 5 additions and 4 deletions
@@ -58,7 +58,7 @@
            <if test="payWorkingGroupSubItem.chargeStatus == 2">
                AND !(if(pwgs.paid_amount is null or pwgs.paid_amount = '',0,pwgs.paid_amount) = if(pwgs.receivable_amount is null or pwgs.receivable_amount = '',0,pwgs.receivable_amount))
            </if>
-            <if test="payWorkingGroupSubItem.pack != null and payWorkingGroupSubItem.pack != ''">
+            <if test="payWorkingGroupSubItem.pack != null">
                and pack = #{payWorkingGroupSubItem.pack}
            </if>
        </where>