From b462c5d631a4fd9619dee5b53c5fe308e59c359b Mon Sep 17 00:00:00 2001
From: weiyunlong <weiyunlong@x-ri.com>
Date: Fri, 29 Nov 2024 16:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96OA=E7=B3=BB=E7=BB=9F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0,=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shkd/repc/recon/formplugin/PayreqBondFormPlugin.java    | 2 +-
 main/java/shkd/utils/OAUtils.java                           | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java b/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java
index f3afa50..628eb83 100644
--- a/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java
+++ b/main/java/shkd/repc/recon/formplugin/PayreqBondFormPlugin.java
@@ -49,7 +49,7 @@ public class PayreqBondFormPlugin extends AbstractFormPlugin {
             for (DynamicObject qeugBondentry : qeugBondentrys) {
                 Date qeugFinalpaymentdate = qeugBondentry.getDate("qeug_finalpaymentdate");//合同:最终付款日期
                 // 比较两个日期
-                if (qeugFinalpaymentdate != null && qeugFinalpaymentamount != null) {
+                if (qeugFinalpaymentdate != null) {
                     if (qeugFinalpaymentdate.before(qeugFinalpaymentamount)) {
                         System.out.println("保证金最终付款日期早于付款申请的最终支付日期");
                         bondamount = bondamount.add(qeugBondentry.getBigDecimal("qeug_depositamount"));//合同:保证金金额
diff --git a/main/java/shkd/utils/OAUtils.java b/main/java/shkd/utils/OAUtils.java
index 8c09008..8adf8a7 100644
--- a/main/java/shkd/utils/OAUtils.java
+++ b/main/java/shkd/utils/OAUtils.java
@@ -28,9 +28,11 @@ import static shkd.repc.resm.opplugin.PushOASupplierOPPlugin.assembleBody;
 public class OAUtils {
 
     private static final Log logger = LogFactory.getLog(OAUtils.class);
+//    public static final String oaUrl = "https://newoa.dobechina.com";//(正式环境外网地址)
     public static final String oaUrl = System.getProperty("oaurl");//(测试环境外网地址)http://140.206.96.138:9091
 //    public static final String oaUrl = "http://172.31.254.240:9090";//本地(内网地址)
 
+
     //致远服务前获取token接口
     public static String getOaToken(String billNo){
 
@@ -39,8 +41,8 @@ public class OAUtils {
         String linkUrl = oaUrl +"/seeyon/rest/token";
         //接口请求体
         JSONObject linkBody = new JSONObject();
-        linkBody.put("userName", userName);
-        linkBody.put("password", password);
+        linkBody.put("userName", System.getProperty("oaUserName"));
+        linkBody.put("password", System.getProperty("oaPassword"));
         String token = "";
 
         try {