Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -154,6 +154,7 @@ public class KwpSettlementTradeController {
         settlementReq.check();
         settlementReq.setUnitType(TradeUnitType.SELL);
         settlementReq.setUnitTypeTwo(TradeUnitType.PURCHASE);
+        settlementReq.setEntId(LoginUserHolder.getEntId());
         List<SettlementTradeDto> list = kwpSettlementTradeService.exportList(settlementReq, settlementReq.getIdList());
         return this.export(response, list);
     }

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -551,7 +551,7 @@
                     <if test="settlementReq.trading != null and settlementReq.trading != ''">
                         and klt.trading = #{settlementReq.trading,jdbcType=VARCHAR}
                     </if>
-                    <if test="settlementReq.status != null">
+                    <if test="settlementReq.status != null and settlementReq.status != 0">
                         and kst.status = #{settlementReq.status,jdbcType=INTEGER}
                     </if>
                     <if test="settlementReq.startCreateTime != null and settlementReq.startCreateTime != '' and settlementReq.endCreateTime != null and settlementReq.endCreateTime != ''">