From dd5c2ba4ce9cdb7fc41c405a6e8439e834b433f5 Mon Sep 17 00:00:00 2001
From: fcli <fcli@che300.com>
Date: Tue, 8 Nov 2022 13:46:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=BC=96=E8=BE=91=E8=AF=A5=E6=89=A3=E7=BC=B4=E4=B9=89?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91=E6=9C=AC=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE&=E4=B8=80=E9=94=AE=E7=B4=AF=E8=AE=A1?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4=E4=B9=89?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E4=B8=8B=E7=9A=84=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/biz/SpecialAddDeductionBiz.java     |  2 +-
 .../SpecialAddDeductionMapper.xml              | 18 +++++++++---------
 .../impl/AddUpDeductionServiceImpl.java        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
index e7b05813e..cece96e18 100644
--- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
+++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
@@ -160,7 +160,7 @@ public class SpecialAddDeductionBiz extends BaseBean {
 
     public List<SpecialAddDeductionPO> getByEmployeeId(List<Long> employeeIds, Long taxAgentId) {
         if (CollectionUtils.isEmpty(employeeIds)) {
-            return Collections.emptyList();
+            employeeIds = Collections.emptyList();
         }
         return mapper().getByEmployeeIds(employeeIds, taxAgentId)
                 .stream()
diff --git a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml
index 37c5a765a..f343b7371 100644
--- a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml
@@ -565,14 +565,14 @@
         select
         <include refid="Base_Column_List"/>
         from hrsa_special_add_deduction t1
-        where
-        <if test="employeeIds == null or employeeIds.size() == 0">
-            1 = 2
-        </if>
-        <foreach collection="employeeIds" item="employeeId" separator="," open="employee_id in (" close=") ">
-            #{employeeId}
-        </foreach>
-        and tax_agent_id = #{taxAgentId}
-        and delete_type = 0
+        <where>
+            <if test="employeeIds != null and employeeIds.size() != 0">
+                <foreach collection="employeeIds" item="employeeId" separator="," open="employee_id in (" close=") ">
+                    #{employeeId}
+                </foreach>
+            </if>
+            and tax_agent_id = #{taxAgentId}
+            and delete_type = 0
+        </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index b3c97fa62..b29cf4b8e 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -656,7 +656,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
             Collection<Long> employeeIds = getTaxAgentService(user)
                     .listEmployeeIdsInTaxAgent(taxAgent.getId());
             List<SpecialAddDeductionPO> employeePOs = getSpecialAddDeductionService(user)
-                    .getSpecialAddDeductionPOByEmployee(new ArrayList<>(employeeIds), taxAgent.getId());
+                    .getSpecialAddDeductionPOByEmployee(null, taxAgent.getId());
 
             //获取上月员工数据，用于累加
             LocalDateTime lastMonthDateTime = LocalDateTime.now().minusMonths(1);