From 8c7bc116719bbae4e7b290a1778cfac0f9e8d0e0 Mon Sep 17 00:00:00 2001
From: calyrex <2213354201@qq.com>
Date: Tue, 11 Feb 2025 15:58:29 +0800
Subject: [PATCH] 80 files update

---
 .../workflow/action/ARSPaymentRecepitAction.java          | 4 ++--
 .../interfaces/workflow/action/EAS_DZDAApproveAction.java | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java
index d9ffe5d..fdce61a 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java
@@ -168,7 +168,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                 logger_c29b3679.info(String.valueOf("ARSPaymentRecepitAction--error--" + requestid + "|" + e.toString()));
                 requestInfo.getRequestManager().setMessageid("ERROR");
                 requestInfo.getRequestManager().setMessagecontent("调用ARS接口出错" + e.toString());
-                logger_c29b3679.error("ARSPaymentRecepitAction e: {}", e.getMessage());
+                logger_c29b3679.error("ARSPaymentRecepitAction e: {}", e);
                 e.printStackTrace();
                 return  WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager()));
             }
@@ -176,7 +176,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
             return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager()));
         } catch (Exception e) {
             e.printStackTrace();
-            logger_c29b3679.error("ARSPaymentRecepitAction e: {}", e.getMessage());
+            logger_c29b3679.error("ARSPaymentRecepitAction e: {}", e);
             return  WeaResult.fail(500, "出错啦", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager()));
         }
     }
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java
index 01779e9..fee58bf 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EAS_DZDAApproveAction.java
@@ -47,6 +47,8 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
     private ConfigProp configProp;
     private static final Logger logger_3f787449 = LoggerFactory.getLogger(EAS_DZDAApproveAction.class);
 
+    @Autowired
+    BillFieldUtil unit;
     @Override
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
         Map<String, Object> weaverResultMap = new HashMap<>();
@@ -80,13 +82,11 @@ public class EAS_DZDAApproveAction extends BaseBean implements Action, EsbServer
             String revisedPlanReturnDate = "";
             try {
                 ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class);
-                BillFieldUtil unit = new BillFieldUtil();
                 Property[] properties = requestInfo.getMainTableInfo().getProperty();
                 requestID = requestInfo.getRequestid();
                 logger_3f787449.info(String.valueOf("EAS_DZDAApproveAction--start--" + requestID));
-                String lastopertorid = requestInfo.getLastoperator();
-                approvalBy = unit.getWorkcode(lastopertorid);
-                logger_3f787449.info(String.valueOf("--lastoperatorid--" + lastopertorid + "||approvalBy=" + approvalBy));
+                approvalBy = unit.getWorkcode(String.valueOf(userIdTemp));
+                logger_3f787449.info(String.valueOf("--lastoperatorid--" + userIdTemp + "||approvalBy=" + approvalBy));
                 approvalDate = getCurrentDate();
                 logger_3f787449.info(String.valueOf("--approvalDate--" + approvalDate));
                 Map<String, String> mMap = new HashMap<String, String>();