From 86ab2a5f2ee52ba24e1247be3cf11023dcf29d43 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 20 Feb 2025 18:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=87=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/manager/service/impl/VerifyDateService.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java
index 81b218c..7c4efe1 100644
--- a/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java
+++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java
@@ -2,6 +2,8 @@ package com.bonus.boot.manager.manager.service.impl;
 
 import com.bonus.boot.manager.manager.dao.VerifyDateDao;
 import com.bonus.boot.manager.manager.entity.EvectionBean;
+import com.bonus.boot.manager.manager.utils.UserUtil;
+import org.apache.catalina.security.SecurityUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +26,9 @@ public class VerifyDateService {
     private VerifyDateDao dao;
 
     public String verifyDate(EvectionBean bean,int type) {
+        if(bean.getUserId() == null){
+            bean.setUserId(Long.parseLong(UserUtil.getLoginUser().getUserId()));
+        }
         List<Map<String, Object>> list = dao.verifyDate(bean,type);
         if(CollectionUtils.isNotEmpty(list)){
             StringBuilder sb = new StringBuilder();
@@ -35,7 +40,7 @@ public class VerifyDateService {
             if(type == 1){ // 出差
                 sb.append("出行人：").append(userName).append("出行日期与").append(leaveType).append("存在冲突日期").append("(").append(prominentDate).append(")");
             }else{ // 请假、轮休、外出
-                sb.append("当前提交的申请日期与").append(leaveType).append("存在冲突日期").append("(").append(prominentDate).append(")");
+                sb.append("当前提交的申请日期与").append(leaveType).append("存在冲突日期").append("（").append(prominentDate).append("）");
             }
             return sb.toString();
         }else{