From f987a5ed94827bea466e5b51c91cd624b268b2d2 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 13 Nov 2024 10:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=8D=8E=E4=BA=A4=E6=8A=95=20?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryBillGetTokenParam.java         |  2 ++
 .../param/SalaryAcctEmployeeQueryParam.java    |  2 +-
 .../impl/SalaryAcctExcelServiceImpl.java       |  1 +
 .../engine/salary/util/SalaryTokenUtil.java    | 18 +++++++++++++++---
 .../wrapper/SalaryAcctResultWrapper.java       |  4 ++--
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryBillGetTokenParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryBillGetTokenParam.java
index 2ab5be248..35d8f829f 100644
--- a/src/com/engine/salary/entity/salaryBill/param/SalaryBillGetTokenParam.java
+++ b/src/com/engine/salary/entity/salaryBill/param/SalaryBillGetTokenParam.java
@@ -23,4 +23,6 @@ public class SalaryBillGetTokenParam {
     // 老 未加密
     private String recipient;
 
+    private Long id;
+
 }
diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
index 664f2f3d0..158d37ae6 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
@@ -68,7 +68,7 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
     private Set<Date> salaryMonths;
 
 
-    private Collection<Long> salaryAcctRecordIds;
+    // private Collection<Long> salaryAcctRecordIds;
     private Collection<Long> salarySobIds;
     private Collection<Long> employeeIds;
 
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index 9f5a6ba21..66b1f2ea2 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -71,6 +71,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.StopWatch;
 import weaver.file.ImageFileManager;
+import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.io.InputStream;
diff --git a/src/com/engine/salary/util/SalaryTokenUtil.java b/src/com/engine/salary/util/SalaryTokenUtil.java
index ec31793d6..f36e1d537 100644
--- a/src/com/engine/salary/util/SalaryTokenUtil.java
+++ b/src/com/engine/salary/util/SalaryTokenUtil.java
@@ -79,18 +79,30 @@ public class SalaryTokenUtil {
      * @return
      */
     public static Map<String, String> GetToken(SalaryBillGetTokenParam param)  {
+        Map<String, String> heads = new HashMap<>();
         String uid = "";
+        BaseBean baseBean = new BaseBean();
+        RecordSet rs = new RecordSet();
         if (StringUtils.isNotBlank(param.getSalaryCode())) {
             uid = AESEncryptUtil.decrypt4SalaryBill(param.getSalaryCode());
         } else {
             uid = param.getRecipient();
+            // 校验id
+            if (param.getId() == null) {
+                return heads;
+            }
+            String correctUid = "";
+            rs.execute("select employee_id as eid from hrsa_salary_send_info where id = " + param.getId());
+            if (rs.next()) {
+                correctUid = rs.getString("eid");
+            }
+            if (StringUtils.isBlank(correctUid) || StringUtils.isBlank(uid) || (!correctUid.equals(uid))) {
+                return heads;
+            }
         }
-        Map<String, String> heads = new HashMap<>();
         if (StringUtils.isBlank(uid)) {
             return heads;
         }
-        BaseBean baseBean = new BaseBean();
-        RecordSet rs = new RecordSet();
         Map<String, String> resultMap = new HashMap<>();
 
         // 获取appid的id
diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
index 3e6b739fd..a1923a9a3 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
@@ -231,8 +231,8 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
         log.info("开始核算V1{}", calculateParam);
 
         //报表参数
-        List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
-        calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
+        // List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
+        // calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
 
         // 校验是否可以编辑
         SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId());