From 31f7ebf78d2996701594023bf3d84dedb5e85ebc Mon Sep 17 00:00:00 2001
From: xuhaihui <2098865055@qq.com>
Date: Fri, 1 Aug 2025 14:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=8A=A5=E9=94=80=E5=8D=95?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E9=9C=80=E4=B8=8E=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E6=94=B6=E6=AC=BE=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E4=BA=BA=E4=B8=80=E8=87=B4=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fs/plugin/operate/DailyReimbursSubOp.java | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java
index e857737..e894e28 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyReimbursSubOp.java
@@ -48,19 +48,26 @@ public class DailyReimbursSubOp extends AbstractOperationServicePlugIn {
                             for (DynamicObject accountEntry : accountEntryCollection) {
                                 String payerType = accountEntry.getString("payertype");//收款人类型
                                 if (payerType.equals("er_payeer")) {
-                                    DynamicObject payer = accountEntry.getDynamicObject("payer");//收款人(个人
-                                    if (payer != null && applier != null) {
-                                        String applierNumber = applier.getString("number");//申请人编号
-                                        DynamicObject payer1 = payer.getDynamicObject("payer");//收款人（个人-收款人
-                                        if (payer1 == null) {
-                                            return;
-                                        }
-                                        String payer1Number = payer1.getString("number");//收款人编号
-                                        if (!applierNumber.equals(payer1Number) && "".equals(zcgj_invoiceremark)) {
-                                            //申请人和收款人不一致
+                                    String payerName = accountEntry.getString("payername");//收款人名称
+                                    if (!"".equals(payerName) && applier != null){
+                                        String applierName = applier.getString("name");//申请人名称
+                                        if (!applierName.equals(payerName) && "".equals(zcgj_invoiceremark)) {
                                             this.addFatalErrorMessage(extendedDataEntity, "收款人与申请人不一致！请填写特殊说明！");
                                         }
                                     }
+//                                    DynamicObject payer = accountEntry.getDynamicObject("payer");//收款人(个人
+//                                    this.addFatalErrorMessage(extendedDataEntity, "收款人与申请人不一致！请填写特殊说明！");
+//                                    if (payer != null && applier != null) {
+//                                        String applierName = applier.getString("name");//申请人编号
+//                                        DynamicObject payer1 = payer.getDynamicObject("payer");//收款人（个人-收款人
+//                                        if (payer1 == null) {
+//                                            return;
+//                                        }
+//                                        String payer1Number = payer1.getString("number");//收款人编号
+//                                        if (!applierName.equals(payer1Number) && "".equals(zcgj_invoiceremark)) {
+//                                            //申请人和收款人不一致
+//                                        }
+//                                    }
                                 }
                             }
                         }