diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java
index efe93ef..72cc0e3 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java
@@ -142,13 +142,19 @@ public class PayApplySaveOperation extends AbstractOperationServicePlugIn implem
 
         //是否充值类
         boolean shjhWhetherrechargecateg = bill.getBoolean("shjh_whetherrechargecateg");
-        QFilter q2 = new QFilter("shjh_czl", QCP.equals, shjhWhetherrechargecateg);
-        qFilter = qFilter.and(q2);
+        if (shjhWhetherrechargecateg) {
+            QFilter q2 = new QFilter("shjh_czl", QCP.equals, shjhWhetherrechargecateg);
+            qFilter = qFilter.and(q2);
+        }
+
 
         //是否自行采购
         boolean shjhZxcg = bill.getBoolean("shjh_zxcg");
-        QFilter q3 = new QFilter("shjh_zxcg", QCP.equals, shjhZxcg);
-        qFilter = qFilter.and(q3);
+        if (shjhZxcg) {
+            QFilter q3 = new QFilter("shjh_zxcg", QCP.equals, shjhZxcg);
+            qFilter = qFilter.and(q3);
+        }
+
 
         //事业部_多选基础资料,通过申请单的二级部门去映射表查询(shjh_ejbm_syb)
         DynamicObject shjhSecondarydept = bill.getDynamicObject("shjh_secondarydept");
@@ -265,7 +271,8 @@ public class PayApplySaveOperation extends AbstractOperationServicePlugIn implem
         DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_request_account", "id,shjh_membersubject", qFilter.toArray());
         if (accounts.length > 1) {
             // 根据生效日期,失效日期区间,判断当前时间满足的数据
-            Date currentDate = new Date();
+//            Date currentDate = new Date();
+            Date currentDate = bill.getDate("applydate");//申请日期
             QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate);
             QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate);
             QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter);
diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java
index 5a8cca3..abf0d9a 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java
@@ -184,7 +184,8 @@ public class PayBillSaveOperation extends AbstractOperationServicePlugIn impleme
         DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_pay_account", "id,shjh_membersubject", qFilter.toArray());
         if (accounts.length > 1) {
             // 根据生效日期,失效日期区间,判断当前时间满足的数据
-            Date currentDate = new Date();
+//            Date currentDate = new Date();
+            Date currentDate = bill.getDate("bizdate");//业务日期
             QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate);
             QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate);
             QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter);