From fa28db9c797ccfb33491ce86ee281cc675c25830 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 7 Jul 2023 10:15:23 +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=A0=B8=E7=AE=97=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=92=8C=E5=AF=BC=E5=87=BA=E5=B8=A6=E5=85=A5=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/salaryacct/SalaryAcctEmployeeMapper.xml | 14 ++++++++++++++
 .../engine/salary/web/SalaryAcctController.java    |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index f141c8728..f414ff60f 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -579,6 +579,7 @@
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
              or (param.workcode != null and param.workcode != '')
+             or (param.subcompanyIds != null and param.subcompanyIds.size()>0)
              or (param.departmentIds != null and param.departmentIds.size()>0) 
              or (param.positionIds != null and param.positionIds.size()>0) 
              or (param.status != null and param.status.toString != 'ALL')">
@@ -592,6 +593,12 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND em.workcode like '%'||#{param.workcode}||'%'
             </if>
+            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+                AND em.subcompanyid1 IN
+                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                    #{subcompanyId}
+                </foreach>
+            </if>
             <if test="param.departmentIds != null and param.departmentIds.size()>0">
                 AND em.departmentid IN
                 <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
@@ -655,6 +662,7 @@
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
              or (param.workcode != null and param.workcode != '')
+             or (param.subcompanyIds != null and param.subcompanyIds.size()>0)
              or (param.departmentIds != null and param.departmentIds.size()>0) 
              or (param.positionIds != null and param.positionIds.size()>0) 
              or (param.status != null and param.status.toString != 'ALL')">
@@ -668,6 +676,12 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND em.workcode like '%'+#{param.workcode}+'%'
             </if>
+            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+                AND em.subcompanyid1 IN
+                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                    #{subcompanyId}
+                </foreach>
+            </if>
             <if test="param.departmentIds != null and param.departmentIds.size()>0">
                 AND em.departmentid IN
                 <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 8df680db0..6f06d003b 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -719,6 +719,14 @@ public class SalaryAcctController {
         if (StringUtils.isNotBlank(ids)) {
             param.setIds(Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList()));
         }
+        String workcode = request.getParameter("workcode");
+        if (StringUtils.isNotBlank(workcode)) {
+            param.setWorkcode(workcode);
+        }
+        String subcompanyIds = request.getParameter("subcompanyIds");
+        if (StringUtils.isNotBlank(subcompanyIds)) {
+            param.setSubcompanyIds(Arrays.stream(subcompanyIds.split(",")).map(Long::valueOf).collect(Collectors.toList()));
+        }
     }