Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -518,7 +518,7 @@
                          fin_selected_receivables_detailed AS se
                      WHERE
                          se.receivablesSid = d.sid
-                       AND se.auditState != '2' and se.auditState != '4'
+                       AND se.auditState =3
                      )),
         0
         ) AS currentReceivableMoney,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -1280,6 +1280,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         }
         qw.eq("b.outDoorState", 2);
         qw.eq("b.isOutFactory", 0);
+        qw.eq("b.nodeCode",5);
         qw.orderByDesc("b.createTime");
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairBillVo> pagging = baseMapper.listPage(page, qw);