From 007328476a13eff6febc819279bc4dbfd53c2f94 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Thu, 1 Jun 2023 11:17:06 +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=E8=96=AA=E8=B5=84=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E5=88=97=E8=A1=A8=E5=B7=A5=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/salaryacct/SalaryAcctEmployeeMapper.xml    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index cc1ad66c2..f141c8728 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -174,6 +174,7 @@
             AND tax_agent_id = #{param.taxAgentId}
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
+            or (param.workcode != null and param.workcode != '')
             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')">
@@ -184,6 +185,9 @@
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'||#{param.employeeName}||'%'
             </if>
+            <if test="param.workcode != null and param.workcode != ''">
+                AND em.workcode like '%'||#{param.workcode}||'%'
+            </if>
             <if test="param.departmentIds != null and param.departmentIds.size()>0">
                 AND em.departmentid IN
                 <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
@@ -251,6 +255,7 @@
             AND tax_agent_id = #{param.taxAgentId}
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
+            or (param.workcode != null and param.workcode != '')
             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')">
@@ -261,6 +266,9 @@
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'+#{param.employeeName}+'%'
             </if>
+            <if test="param.workcode != null and param.workcode != ''">
+                AND em.workcode like '%'+#{param.workcode}+'%'
+            </if>
             <if test="param.departmentIds != null and param.departmentIds.size()>0">
                 AND em.departmentid IN
                 <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
@@ -485,6 +493,7 @@
             AND t.tax_agent_id = #{param.taxAgentId}
         </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)
@@ -569,6 +578,7 @@
             AND t.tax_agent_id = #{param.taxAgentId}
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
+             or (param.workcode != null and param.workcode != '')
              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')">
@@ -644,6 +654,7 @@
             AND t.tax_agent_id = #{param.taxAgentId}
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
+             or (param.workcode != null and param.workcode != '')
              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')">