From 2fbd66ac19410bbb1fd8505e37b529e13cf2983f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 16 Dec 2022 10:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/action/BatEditSalaryExcelAction.java  | 15 ++++++++++++++-
 .../action/CheckBatEditSalaryExcelAction.java    | 16 ++++++++++++++--
 .../salary/action/CheckEditSalaryAction.java     |  5 ++++-
 .../engine/salary/action/EditSalaryAction.java   |  7 +++++--
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/action/BatEditSalaryExcelAction.java b/src/com/engine/salary/action/BatEditSalaryExcelAction.java
index fbf7c7c85..adddc2de9 100644
--- a/src/com/engine/salary/action/BatEditSalaryExcelAction.java
+++ b/src/com/engine/salary/action/BatEditSalaryExcelAction.java
@@ -35,6 +35,16 @@ public class BatEditSalaryExcelAction implements Action {
         this.batSalaryExcelField = batSalaryExcelField;
     }
 
+    private String operatorField;
+
+    public String getOperatorField() {
+        return operatorField;
+    }
+
+    public void setOperatorField(String operatorField) {
+        this.operatorField = operatorField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -60,7 +70,10 @@ public class BatEditSalaryExcelAction implements Action {
                     .isProcess(true)
                     .build();
 
-            Map<String, Object> map = getSalaryArchiveExcelService(new User()).batchImportEbatch(param);
+            //操作人
+            String uid = fieldMap.getOrDefault(operatorField, "1");
+            Map<String, Object> map = getSalaryArchiveExcelService(new User(Integer.parseInt(uid))).batchImportEbatch(param);
+
             int errorCount = (int) map.get("errorCount");
             if (errorCount > 0) {
                 log.error("批量调薪存在异常 requestId:{}  map:{}",requestInfo.getRequestid(), map);
diff --git a/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java b/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java
index 8d6313cd7..408b2fa7f 100644
--- a/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java
+++ b/src/com/engine/salary/action/CheckBatEditSalaryExcelAction.java
@@ -36,6 +36,16 @@ public class CheckBatEditSalaryExcelAction implements Action {
         this.batSalaryExcelField = batSalaryExcelField;
     }
 
+    private String operatorField;
+
+    public String getOperatorField() {
+        return operatorField;
+    }
+
+    public void setOperatorField(String operatorField) {
+        this.operatorField = operatorField;
+    }
+
     @Override
     public String execute(RequestInfo requestInfo) {
         try {
@@ -60,10 +70,12 @@ public class CheckBatEditSalaryExcelAction implements Action {
                     .isProcess(true)
                     .build();
 
-            Map<String, Object> map = getSalaryArchiveExcelService(new User()).batchImportEbatch(param);
+            //操作人
+            String uid = fieldMap.getOrDefault(operatorField, "1");
+            Map<String, Object> map = getSalaryArchiveExcelService(new User(Integer.parseInt(uid))).batchImportEbatch(param);
             int errorCount = (int) map.get("errorCount");
             if (errorCount > 0) {
-                log.error("批量调薪检查存在异常 requestId:{}  map:{}",requestInfo.getRequestid(), map);
+                log.error("批量调薪检查存在异常 requestId:{}  map:{}", requestInfo.getRequestid(), map);
                 List<Map<String, String>> excelComments = (List<Map<String, String>>) map.get("errorNotice");
                 StringBuilder message = new StringBuilder("excel中");
                 for (Map<String, String> comments : excelComments) {
diff --git a/src/com/engine/salary/action/CheckEditSalaryAction.java b/src/com/engine/salary/action/CheckEditSalaryAction.java
index f6b2a7cd3..7cee919f3 100644
--- a/src/com/engine/salary/action/CheckEditSalaryAction.java
+++ b/src/com/engine/salary/action/CheckEditSalaryAction.java
@@ -65,7 +65,10 @@ public class CheckEditSalaryAction implements Action {
             SalaryArchiveImportActionParam build = SalaryArchiveImportActionParam.builder()
                     .importDatas(importData)
                     .build();
-            Map<String, Object> map = getSalaryArchiveWrapper(new User()).checkAdjustmentSalaryArchive(build);
+
+            //操作人
+            String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(SalaryField::getValue).orElse("1");
+            Map<String, Object> map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).checkAdjustmentSalaryArchive(build);
 
             List errorNotice = (List) map.get("errorNotice");
             if (CollectionUtils.isNotEmpty(errorNotice)) {
diff --git a/src/com/engine/salary/action/EditSalaryAction.java b/src/com/engine/salary/action/EditSalaryAction.java
index 8ce5bc43a..eed5d1648 100644
--- a/src/com/engine/salary/action/EditSalaryAction.java
+++ b/src/com/engine/salary/action/EditSalaryAction.java
@@ -65,11 +65,14 @@ public class EditSalaryAction implements Action {
             SalaryArchiveImportActionParam build = SalaryArchiveImportActionParam.builder()
                     .importDatas(importData)
                     .build();
-            Map<String, Object> map = getSalaryArchiveWrapper(new User()).adjustmentSalaryArchive(build);
+
+            //操作人
+            String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(SalaryField::getValue).orElse("1");
+            Map<String, Object> map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).adjustmentSalaryArchive(build);
 
             List errorNotice = (List) map.get("errorNotice");
             if (CollectionUtils.isNotEmpty(errorNotice)) {
-                log.error("调薪存在异常 requestId:{}  map:{}",requestInfo.getRequestid(), map);
+                log.error("调薪存在异常 requestId:{}  map:{}", requestInfo.getRequestid(), map);
 //                List<Map<String, String>> excelComments = (List<Map<String, String>>) map.get("errorNotice");
 //                StringBuilder message = new StringBuilder("");
 //                for (Map<String, String> comments : excelComments) {