diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java
index f099da5b..e7db5994 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmGiftApplyServiceImpl.java
@@ -119,24 +119,24 @@ public class CrmGiftApplyServiceImpl implements ICrmGiftApplyService {
         MPJLambdaWrapper<CrmGiftApply> lqw = JoinWrappers.lambda(CrmGiftApply.class)
         .selectAll(CrmGiftApply.class)
         .eq(CrmGiftApply::getDelFlag, "0")
-                    .eq(StringUtils.isNotBlank(bo.getApplicationCode()), CrmGiftApply::getApplicationCode, bo.getApplicationCode())
-                    .eq(bo.getApplicantId() != null, CrmGiftApply::getApplicantId, bo.getApplicantId())
-                    .like(StringUtils.isNotBlank(bo.getApplicantName()), CrmGiftApply::getApplicantName, bo.getApplicantName())
-                    .eq(bo.getApplicantDeptId() != null, CrmGiftApply::getApplicantDeptId, bo.getApplicantDeptId())
-                    .like(StringUtils.isNotBlank(bo.getApplicantDeptName()), CrmGiftApply::getApplicantDeptName, bo.getApplicantDeptName())
-                    .eq(bo.getApplicationDate() != null, CrmGiftApply::getApplicationDate, bo.getApplicationDate())
-                    .eq(bo.getCustomerUnitId() != null, CrmGiftApply::getCustomerUnitId, bo.getCustomerUnitId())
-                    .like(StringUtils.isNotBlank(bo.getCustomerUnitName()), CrmGiftApply::getCustomerUnitName, bo.getCustomerUnitName())
-                    .like(StringUtils.isNotBlank(bo.getGuestName()), CrmGiftApply::getGuestName, bo.getGuestName())
-                    .eq(bo.getPeopleCount() != null, CrmGiftApply::getPeopleCount, bo.getPeopleCount())
-                    .eq(StringUtils.isNotBlank(bo.getApplicationReason()), CrmGiftApply::getApplicationReason, bo.getApplicationReason())
-                    .eq(bo.getRecipientId() != null, CrmGiftApply::getRecipientId, bo.getRecipientId())
-                    .like(StringUtils.isNotBlank(bo.getRecipientName()), CrmGiftApply::getRecipientName, bo.getRecipientName())
-                    .eq(bo.getRecipientDate() != null, CrmGiftApply::getRecipientDate, bo.getRecipientDate())
-                    .eq(bo.getTotalAmount() != null, CrmGiftApply::getTotalAmount, bo.getTotalAmount())
-                    .eq(StringUtils.isNotBlank(bo.getApplicationStatus()), CrmGiftApply::getApplicationStatus, bo.getApplicationStatus())
-                    .eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmGiftApply::getFlowStatus, bo.getFlowStatus())
-                    .orderByDesc(CrmGiftApply::getCreateTime);
+                .eq(StringUtils.isNotBlank(bo.getApplicationCode()), CrmGiftApply::getApplicationCode, bo.getApplicationCode())
+                .eq(bo.getApplicantId() != null, CrmGiftApply::getApplicantId, bo.getApplicantId())
+                .like(StringUtils.isNotBlank(bo.getApplicantName()), CrmGiftApply::getApplicantName, bo.getApplicantName())
+                .eq(bo.getApplicantDeptId() != null, CrmGiftApply::getApplicantDeptId, bo.getApplicantDeptId())
+                .like(StringUtils.isNotBlank(bo.getApplicantDeptName()), CrmGiftApply::getApplicantDeptName, bo.getApplicantDeptName())
+                .eq(bo.getApplicationDate() != null, CrmGiftApply::getApplicationDate, bo.getApplicationDate())
+                .eq(bo.getCustomerUnitId() != null, CrmGiftApply::getCustomerUnitId, bo.getCustomerUnitId())
+                .like(StringUtils.isNotBlank(bo.getCustomerUnitName()), CrmGiftApply::getCustomerUnitName, bo.getCustomerUnitName())
+                .like(StringUtils.isNotBlank(bo.getGuestName()), CrmGiftApply::getGuestName, bo.getGuestName())
+                .eq(bo.getPeopleCount() != null, CrmGiftApply::getPeopleCount, bo.getPeopleCount())
+                .eq(StringUtils.isNotBlank(bo.getApplicationReason()), CrmGiftApply::getApplicationReason, bo.getApplicationReason())
+                .eq(bo.getRecipientId() != null, CrmGiftApply::getRecipientId, bo.getRecipientId())
+                .like(StringUtils.isNotBlank(bo.getRecipientName()), CrmGiftApply::getRecipientName, bo.getRecipientName())
+                .eq(bo.getRecipientDate() != null, CrmGiftApply::getRecipientDate, bo.getRecipientDate())
+                .eq(bo.getTotalAmount() != null, CrmGiftApply::getTotalAmount, bo.getTotalAmount())
+                .eq(StringUtils.isNotBlank(bo.getApplicationStatus()), CrmGiftApply::getApplicationStatus, bo.getApplicationStatus())
+                .eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmGiftApply::getFlowStatus, bo.getFlowStatus())
+                .orderByDesc(CrmGiftApply::getCreateTime);
         return lqw;
     }
 
@@ -162,6 +162,14 @@ public class CrmGiftApplyServiceImpl implements ICrmGiftApplyService {
                 // 保底：前端未传且无法获取则保持空，避免提交失败
             }
         }
+        // 补齐申请部门id（有些前端浏览器可能未带出）
+        if (add.getApplicantDeptId() == null) {
+            try {
+                add.setApplicantDeptId(LoginHelper.getLoginUser().getDeptId());
+            } catch (Exception ignored) {
+                // 保底：前端未传且无法获取则保持空，避免提交失败
+            }
+        }
         // 新增时设置默认状态为草稿
         if (StringUtils.isBlank(add.getApplicationStatus())) {
             add.setApplicationStatus(OAStatusEnum.DRAFT.getStatus());