From 24187b95bf2bdbc21c3e02a21cb1b219f9abb790 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Mon, 6 Jun 2022 11:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java                  | 4 ++--
 .../engine/salary/mapper/siarchives/SocialSchemeMapper.xml    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index dad8420be..a080c37ab 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -590,11 +590,11 @@ public class SIArchivesBiz {
         }
 
         if(StringUtils.isNotBlank(param.getDepartmentIdsStr())) {
-            request.setDepartmentIds(Arrays.stream(param.getDepartmentIdsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList()));
+            param.setDepartmentIds(Arrays.stream(param.getDepartmentIdsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList()));
         }
 
         if(StringUtils.isNotBlank(param.getPositionsStr())) {
-            request.setDepartmentIds(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList()));
+            param.setDepartmentIds(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList()));
         }
 
         Integer current = param.getCurrent() == null ? 1 : param.getCurrent();
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
index 0be69bf8f..584837e18 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
@@ -323,6 +323,7 @@
         FROM
         hrmresource e
         LEFT JOIN hrmdepartment d ON e.departmentid = d.ID
+        where e.accounttype is null
         )a
         LEFT JOIN(
         SELECT