合同列表BUG

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -214,7 +214,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
         }
         if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
-            wrapper.in("t1.refundStatusNew", dto.getRefundStatusNew().split(","));
+            wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
         }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -7,7 +7,7 @@
              (SELECT t1.*,
                      IFNULL(t1.amount, 0) * IFNULL(t1.rate, 0) AS amountCNY,
                      CASE
-                         WHEN (t1.amount - t1.sumClaimMoney) <= 0 THEN
+                         WHEN ( IFNULL( t1.amount, 0 ) * IFNULL( t1.rate, 0 ) - t1.sumClaimMoney ) <=  0 THEN
                              20
                          WHEN t1.sumClaimMoney = 0 THEN
                              0