1.增加待还款对还款人的过滤

2.待报销借款预付类条件连接错误

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/ReimWorkBenchesHelper.java

@@ -144,12 +144,12 @@ public class ReimWorkBenchesHelper {
         DataSet dailyloanDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_dailyloanbill",
                 "id billid,bizdate applydate,'er_dailyloanbill' billtype,'er_dailyloanbill' pageid,billno billno,description description,loanamount applyamount," +
                         "approveamount approveamount,balanceamount balanceamount,billstatus billstatus,costcompany.id company,applier.id applier",
-                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter.and(waitPayLoanPayFilter)), "");
+                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter.or(waitPayLoanPayFilter)), "");
 
         DataSet prepayBillDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_prepaybill",
                 "id billid,bizdate applydate,'er_prepaybill' billtype,case when nckd_pageid = 'nckd_er_srmperpaybill' then 'nckd_er_srmperpaybill' else 'nckd_er_dailyloanbill' end pageid,billno billno,description description,loanamount applyamount," +
                         "approveamount approveamount,balanceamount balanceamount,billstatus billstatus,costcompany.id company,applier.id applier",
-                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter.and(waitPayLoanPayFilter)), "");
+                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter.or(waitPayLoanPayFilter)), "");
 
         dataSetList.add(dailyloanDataSet);
         dataSetList.add(prepayBillDataSet);
@@ -311,6 +311,8 @@ public class ReimWorkBenchesHelper {
             commonFilterList.add(new QFilter("billno",QCP.like,"%"+ quickFilter +"%")
                     .or(new QFilter("description",QCP.like,"%"+ quickFilter +"%")));
         }
+        long currUserId = RequestContext.get().getCurrUserId();
+        commonFilterList.add(new QFilter("applier",QCP.equals,currUserId));
 
         List<QFilter> repayFilter = new ArrayList<>();
         repayFilter.add(new QFilter("billstatus",QCP.in,new String[]{"A","B","C","D","E","G"}));