From 65acd6e3068e8e2d63afdb5819a0f33b6b9aa7da Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 5 Mar 2026 17:09:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employeesapply/mapper/xml/EmployeesApplyMapper.xml        | 4 +++-
 .../service/impl/EmployeesApplyServiceImpl.java               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
index 79548924..3e2f19b2 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
@@ -207,7 +207,9 @@
         where b.employee_id = #{employeeId}
           and b.status = #{status}
           and b.iz_history = #{izHistory}
-          and b.apply_type = #{applyType}
+          <if test="applyType != null and applyType !=''">
+              and b.apply_type = #{applyType}
+          </if>
         order by b.create_time desc
         limit 1
     </select>
diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/service/impl/EmployeesApplyServiceImpl.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/service/impl/EmployeesApplyServiceImpl.java
index fccfcf5b..99534322 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/service/impl/EmployeesApplyServiceImpl.java
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/service/impl/EmployeesApplyServiceImpl.java
@@ -104,7 +104,7 @@ public class EmployeesApplyServiceImpl extends ServiceImpl<EmployeesApplyMapper,
         usingEa.setEmployeeId(employeesApply.getEmployeeId());
         usingEa.setStatus("1");
         usingEa.setIzHistory("N");
-        usingEa.setApplyType("2");
+//        usingEa.setApplyType("2");
         EmployeesApply modifyData = baseMapper.getModifyData(usingEa);
         if (modifyData == null) {
             return Collections.emptyList();