diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/PayBillListPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/PayBillListPlugin.java
index 386fba0..aa34b09 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/form/PayBillListPlugin.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/PayBillListPlugin.java
@@ -19,25 +19,25 @@ public class PayBillListPlugin extends AbstractListPlugin implements Plugin {
     @Override
     public void beforeItemClick(BeforeItemClickEvent evt) {
         super.beforeItemClick(evt);
-        BillList list = (BillList) this.getView().getControl("billlistap");
-        ListSelectedRowCollection selectedRows = list.getSelectedRows();
-        if (selectedRows == null || selectedRows.isEmpty()) {
-            this.getView().showTipNotification("请选择需要操作的付款单！");
-            evt.setCancel(true);
-            return;
-        }
-        if (selectedRows.size()>1){
-            this.getView().showTipNotification("请选择单条数据进行操作");
-            evt.setCancel(true);
-            return;
-        }
-
-        DynamicObject recBill= BusinessDataServiceHelper.loadSingle(
-                selectedRows.get(0).getPrimaryKeyValue(),
-                EntityMetadataCache.getDataEntityType("cas_paybill"));
 
         String key = evt.getItemKey().toLowerCase();
         if ("tblcancelpay".equals(key)){
+            BillList list = (BillList) this.getView().getControl("billlistap");
+            ListSelectedRowCollection selectedRows = list.getSelectedRows();
+            if (selectedRows == null || selectedRows.isEmpty()) {
+                this.getView().showTipNotification("请选择需要操作的付款单！");
+                evt.setCancel(true);
+                return;
+            }
+            if (selectedRows.size()>1){
+                this.getView().showTipNotification("请选择单条数据进行操作");
+                evt.setCancel(true);
+                return;
+            }
+
+            DynamicObject recBill= BusinessDataServiceHelper.loadSingle(
+                    selectedRows.get(0).getPrimaryKeyValue(),
+                    EntityMetadataCache.getDataEntityType("cas_paybill"));
             this.cancelPayValidator(evt,recBill);
         }
 
diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillChangeListExtendPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillChangeListExtendPlugin.java
index 2e41209..afc8b28 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillChangeListExtendPlugin.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/form/RecBillChangeListExtendPlugin.java
@@ -38,27 +38,43 @@ public class RecBillChangeListExtendPlugin extends AbstractListPlugin implements
     @Override
     public void beforeItemClick(BeforeItemClickEvent evt) {
         super.beforeItemClick(evt);
-        BillList list = (BillList) this.getView().getControl("billlistap");
-        ListSelectedRowCollection selectedRows = list.getSelectedRows();
-        if (selectedRows == null || selectedRows.isEmpty()) {
-            this.getView().showTipNotification("请选择需要操作的收款单！");
-            evt.setCancel(true);
-            return;
-        }
-        if (selectedRows.size()>1){
-            this.getView().showTipNotification("请选择单条数据进行操作");
-            evt.setCancel(true);
-            return;
-        }
-
-        DynamicObject recBill= BusinessDataServiceHelper.loadSingle(
-                selectedRows.get(0).getPrimaryKeyValue(),
-                EntityMetadataCache.getDataEntityType("cas_recbill"));
 
         String key = evt.getItemKey().toLowerCase();
         if ("tblrecchg".equals(key)) {
+            BillList list = (BillList) this.getView().getControl("billlistap");
+            ListSelectedRowCollection selectedRows = list.getSelectedRows();
+            if (selectedRows == null || selectedRows.isEmpty()) {
+                this.getView().showTipNotification("请选择需要操作的收款单！");
+                evt.setCancel(true);
+                return;
+            }
+            if (selectedRows.size()>1){
+                this.getView().showTipNotification("请选择单条数据进行操作");
+                evt.setCancel(true);
+                return;
+            }
+
+            DynamicObject recBill= BusinessDataServiceHelper.loadSingle(
+                    selectedRows.get(0).getPrimaryKeyValue(),
+                    EntityMetadataCache.getDataEntityType("cas_recbill"));
             this.changeBillValidator(evt,recBill);
         }else if ("cancelrec".equals(key)){
+            BillList list = (BillList) this.getView().getControl("billlistap");
+            ListSelectedRowCollection selectedRows = list.getSelectedRows();
+            if (selectedRows == null || selectedRows.isEmpty()) {
+                this.getView().showTipNotification("请选择需要操作的收款单！");
+                evt.setCancel(true);
+                return;
+            }
+            if (selectedRows.size()>1){
+                this.getView().showTipNotification("请选择单条数据进行操作");
+                evt.setCancel(true);
+                return;
+            }
+
+            DynamicObject recBill= BusinessDataServiceHelper.loadSingle(
+                    selectedRows.get(0).getPrimaryKeyValue(),
+                    EntityMetadataCache.getDataEntityType("cas_recbill"));
             this.cancelRecValidator(evt,recBill);
         }