From e7e1f0ace65b59194872a715a743d7da9d377f2c Mon Sep 17 00:00:00 2001
From: qianshijiang <1965297290@qq.com>
Date: Thu, 15 Jan 2026 16:55:01 +0800
Subject: [PATCH] =?UTF-8?q?erp=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base-server/src/main/resources/application-dev.yml  |  2 +-
 .../src/main/resources/application-local.yml        |  2 +-
 .../com/zt/plat/module/erp/utils/ErpConfig.java     | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/base-server/src/main/resources/application-dev.yml b/base-server/src/main/resources/application-dev.yml
index ae3f04ee..40e5341c 100644
--- a/base-server/src/main/resources/application-dev.yml
+++ b/base-server/src/main/resources/application-dev.yml
@@ -121,7 +121,7 @@ justauth:
 erp:
   address: hana-dev.yncic.com
   sapsys: ZTDEV203
-  secretKey: 123456789  # erp秘钥
+  secret-key: 123456789  # erp秘钥
 
 eplat:
   share:
diff --git a/base-server/src/main/resources/application-local.yml b/base-server/src/main/resources/application-local.yml
index 3511ab7f..1a090514 100644
--- a/base-server/src/main/resources/application-local.yml
+++ b/base-server/src/main/resources/application-local.yml
@@ -105,7 +105,7 @@ zt:
 erp:
   address: hana-dev.yncic.com
   sapsys: ZTDEV203
-  secretKey: 123456789  # erp秘钥
+  secret-key: 123456789  # erp秘钥
 
 eplat:
   share:
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
index fa6dabd7..c88b92bc 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java
@@ -32,7 +32,7 @@ public class ErpConfig {
     @Value("${erp.sapsys:}")
     private String sapsys;
 
-    @Value("${erp.secretKey:}")
+    @Value("${erp.secret-key:}")
     private String secretKey;
 
     /**
@@ -153,18 +153,21 @@ public class ErpConfig {
                 throw exception(ERP_NOT_EXISTS);
             } else if (succeed && "S".equals(data.getString("E_FLAG"))) {
                 String flag = "S";
-                String E_RESP = data.getString("E_RESP");
-                String E_MSG = data.getString("ET_MSG");
+                String E_RESP = data.containsKey("E_RESP") ? data.getString("E_RESP") : null;
+                String E_MSG = data.containsKey("ET_MSG") ? data.getString("ET_MSG") : null;
+                if (StrUtil.isBlank(E_MSG)) {
+                    E_MSG = jsonResponse.getString("msg");
+                }
                 resMap.put("E_RESP", E_RESP);
                 resMap.put("resStr", E_MSG);
                 resMap.put("flag", flag);
             } else if (!succeed && "E".equals(data.getString("E_FLAG"))) {
                 String flag = "E";
-                String E_MSG = data.getString("ET_MSG");
+                String E_RESP = data.containsKey("E_RESP") ? data.getString("E_RESP") : null;
+                String E_MSG = data.containsKey("ET_MSG") ? data.getString("ET_MSG") : null;
                 if (StrUtil.isBlank(E_MSG)) {
                     E_MSG = jsonResponse.getString("msg");
                 }
-                String E_RESP = data.getString("E_RESP");
                 resMap.put("E_RESP", E_RESP);
                 resMap.put("resStr", E_MSG);
                 resMap.put("flag", flag);