From 83e16cedf6d48b5d9b9607b0c887460a19223ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 20 Oct 2023 09:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E7=B4=AF=E8=AE=A1bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/biz/AddUpSituationBiz.java  | 12 +++++++++-
 .../engine/salary/biz/OtherDeductionBiz.java  | 24 ++++++++++++-------
 .../salary/biz/SalaryArchiveItemBiz.java      | 14 +++++++++--
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java
index 1ef7cb103..e1fbdb901 100644
--- a/src/com/engine/salary/biz/AddUpSituationBiz.java
+++ b/src/com/engine/salary/biz/AddUpSituationBiz.java
@@ -46,8 +46,18 @@ public class AddUpSituationBiz extends BaseBean {
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class);
-            List<AddUpSituation> addUpSituations = mapper.listSome(param);
+            if(CollectionUtils.isNotEmpty(param.getEmployeeIds())){
+                List<AddUpSituation> addUpSituations = new ArrayList<>();
+                List<List<Long>> partition = Lists.partition((List<Long>) param.getEmployeeIds(), 500);
+                partition.forEach(l->{
+                    param.setEmployeeIds(l);
+                    addUpSituations.addAll(mapper.listSome(param));
+                });
             return encryptUtil.decryptList(addUpSituations, AddUpSituation.class);
+            }else {
+                List<AddUpSituation> addUpSituations = mapper.listSome(param);
+                return encryptUtil.decryptList(addUpSituations, AddUpSituation.class);
+            }
         } finally {
             sqlSession.close();
         }
diff --git a/src/com/engine/salary/biz/OtherDeductionBiz.java b/src/com/engine/salary/biz/OtherDeductionBiz.java
index 5b6002825..1b107764c 100644
--- a/src/com/engine/salary/biz/OtherDeductionBiz.java
+++ b/src/com/engine/salary/biz/OtherDeductionBiz.java
@@ -28,8 +28,18 @@ public class OtherDeductionBiz extends BaseBean {
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class);
-            List<OtherDeductionPO> otherDeductionPOS = mapper.listSome(param);
-            return encryptUtil.decryptList(otherDeductionPOS, OtherDeductionPO.class);
+            if (CollectionUtils.isNotEmpty(param.getEmployeeIds())) {
+                List<List<Long>> partition = Lists.partition(param.getEmployeeIds(), 500);
+                List<OtherDeductionPO> otherDeductionPOS = new ArrayList<>();
+                partition.forEach(l -> {
+                    param.setEmployeeIds(l);
+                    otherDeductionPOS.addAll(mapper.listSome(param));
+                });
+                return encryptUtil.decryptList(otherDeductionPOS, OtherDeductionPO.class);
+            }else {
+                List<OtherDeductionPO> otherDeductionPOS = mapper.listSome(param);
+                return encryptUtil.decryptList(otherDeductionPOS, OtherDeductionPO.class);
+            }
         } finally {
             sqlSession.close();
         }
@@ -77,7 +87,7 @@ public class OtherDeductionBiz extends BaseBean {
      * @return
      */
     public void batchSave(List<OtherDeductionPO> param) {
-        if(CollectionUtils.isEmpty(param)){
+        if (CollectionUtils.isEmpty(param)) {
             return;
         }
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
@@ -99,7 +109,7 @@ public class OtherDeductionBiz extends BaseBean {
      * @return
      */
     public void batchUpdate(List<OtherDeductionPO> param) {
-        if(CollectionUtils.isEmpty(param)){
+        if (CollectionUtils.isEmpty(param)) {
             return;
         }
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
@@ -115,10 +125,6 @@ public class OtherDeductionBiz extends BaseBean {
     }
 
 
-
-
-
-
     /**
      * 处理导入数据
      *
@@ -183,8 +189,8 @@ public class OtherDeductionBiz extends BaseBean {
 
 
     /**
-     * @description 批量删除
      * @return void
+     * @description 批量删除
      * @author Harryxzy
      * @date 2022/10/27 16:07
      */
diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
index b82cd7e81..df3c5041a 100644
--- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
+++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
@@ -34,8 +34,18 @@ public class SalaryArchiveItemBiz {
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class);
-            List<SalaryArchiveItemPO> salaryArchiveItemPOS = mapper.listByParam(build);
-            return encryptUtil.decryptList(salaryArchiveItemPOS, SalaryArchiveItemPO.class);
+            if (CollectionUtils.isNotEmpty(build.getEmployeeIds())) {
+                List<SalaryArchiveItemPO> salaryArchiveItemPOS = new ArrayList<>();
+                List<List<Long>> partition = Lists.partition((List<Long>) build.getEmployeeIds(), 500);
+                partition.forEach(l -> {
+                    build.setEmployeeIds(l);
+                    salaryArchiveItemPOS.addAll(mapper.listByParam(build));
+                });
+                return encryptUtil.decryptList(salaryArchiveItemPOS, SalaryArchiveItemPO.class);
+            } else {
+                List<SalaryArchiveItemPO> salaryArchiveItemPOS = mapper.listByParam(build);
+                return encryptUtil.decryptList(salaryArchiveItemPOS, SalaryArchiveItemPO.class);
+            }
         } finally {
             sqlSession.close();
         }