From ad37ba9af02451f6240a0611cf78e9036d30586d Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Tue, 11 Jul 2023 11:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E6=A1=A3=E6=A1=88=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=B7=A5=E5=8F=B7=E3=80=81=E5=88=86=E9=83=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/web/SalaryArchiveController.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java
index af9aad165..a367bd940 100644
--- a/src/com/engine/salary/web/SalaryArchiveController.java
+++ b/src/com/engine/salary/web/SalaryArchiveController.java
@@ -442,6 +442,10 @@ public class SalaryArchiveController {
         if (StringUtils.isNotBlank(username)) {
             param.setUsername(username);
         }
+        String workcode = request.getParameter("workcode");
+        if (StringUtils.isNotBlank(workcode)) {
+            param.setWorkcode(workcode);
+        }
         String taxAgentId = request.getParameter("taxAgentId");
         if (StringUtils.isNotBlank(taxAgentId)) {
             param.setTaxAgentId(Long.valueOf(taxAgentId));
@@ -450,6 +454,10 @@ public class SalaryArchiveController {
         if (StringUtils.isNotBlank(departmentIds)) {
             param.setDepartmentIds(Arrays.stream(departmentIds.split(",")).map(Long::valueOf).collect(Collectors.toList()));
         }
+        String subcompanyIds = request.getParameter("subcompanyIds");
+        if (StringUtils.isNotBlank(subcompanyIds)) {
+            param.setSubcompanyIds(Arrays.stream(subcompanyIds.split(",")).map(Long::valueOf).collect(Collectors.toList()));
+        }
         String positionIds = request.getParameter("positionIds");
         if (StringUtils.isNotBlank(positionIds)) {
             param.setPositionIds(Arrays.stream(positionIds.split(",")).map(Long::valueOf).collect(Collectors.toList()));