dd

2024-12-03 16:47:45 +08:00 · 2024-12-03 16:47:45 +08:00 · bcc81e7ce3
parent f2be0d19f2
commit bcc81e7ce3
2 changed files with 5 additions and 5 deletions
--- 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"
--- 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, "上班打卡:时间异常") {