From bcc81e7ce340dc1786453cf54e53ca35fed03571 Mon Sep 17 00:00:00 2001
From: jiangyong27 <yong27@163.com>
Date: Tue, 3 Dec 2024 16:47:45 +0800
Subject: [PATCH] dd

---
 conf/server.conf.dev | 2 +-
 service/staff.go     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/server.conf.dev b/conf/server.conf.dev
index 2058886..0ce2532 100644
--- a/conf/server.conf.dev
+++ b/conf/server.conf.dev
@@ -12,7 +12,7 @@ db   = "enterprise"
 
 [unify_mysql]
 host = "192.168.2.50"
-port = 13307
+port = 23307
 user = "unify"
 pass = "MDE2LCJIYXNoSWQiOjY"
 db   = "unify"
diff --git a/service/staff.go b/service/staff.go
index 8ba7063..0933ebf 100644
--- a/service/staff.go
+++ b/service/staff.go
@@ -272,10 +272,10 @@ func (s *Staff) getRealWorkDay(entryDate, leaveDate, username, month string) flo
 		}
 
 		////有请假申请的不算出勤
-		//approvalVacation, _ := dao.NewApprovalVacationDao().GetByUsernameDay(username, checkin.Day)
-		//if approvalVacation != nil {
-		//	continue
-		//}
+		approvalVacation, _ := dao.NewApprovalVacationDao().GetByUsernameDay(username, checkin.Day)
+		if approvalVacation != nil {
+			continue
+		}
 
 		// 迟到的按时间折算
 		if strings.Contains(checkin.Exception, "上班打卡:时间异常") {