From 309b9804b486aff7cea8de08953d297da0e0ad32 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Fri, 28 Feb 2025 10:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=81=87=E6=9C=9F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/crmcontract/CrmContractMapper.xml   | 2 +-
 .../holidayuserrecord/HolidayUserRecordServiceImpl.java  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmcontract/CrmContractMapper.xml b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmcontract/CrmContractMapper.xml
index e8262664..72815c3f 100644
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmcontract/CrmContractMapper.xml
+++ b/yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmcontract/CrmContractMapper.xml
@@ -98,7 +98,7 @@
         <where>
             a.deleted = 0
             and b.deleted = 0
-            <if test="userIds != null and userIds.length > 0">
+            <if test="userIds != null and userIds.size() > 0">
                 AND a.owner_user_id in
                 <foreach collection="userIds" item="id" index="index" open="(" close=")" separator=",">
                     #{id}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java
index 484217eb..04a81d67 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java
@@ -281,9 +281,11 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
             String year = String.valueOf(now.getYear());
             newHolidayUserDOList.forEach(
                     a -> {
-                        newHolidayUserEmploymentRecordDOList.add(new HolidayUserEmploymentRecordDO().setUserId(a.getUserId())
-                                .setHolidaySettingId(holidaySetting.getId())
-                                .setYearNum(year));
+                        if (BigDecimal.ZERO.compareTo(a.getHolidayBalance()) > 0) {
+                            newHolidayUserEmploymentRecordDOList.add(new HolidayUserEmploymentRecordDO().setUserId(a.getUserId())
+                                    .setHolidaySettingId(holidaySetting.getId())
+                                    .setYearNum(year));
+                        }
                     }
             );
             if (CollUtil.isNotEmpty(newHolidayUserEmploymentRecordDOList)) {
@@ -300,6 +302,7 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
         List<AdminUserDO> users = this.getUsersByRange(holidaySetting, holidaySettingRangeDOS);
         // -- 计算获取每个人的假期额度
         Map<Long, BigDecimal> userQuotaMap = this.getQuotaMap(users, holidayBalanceSettingDO, holidayWorkingAgeDOS);
+        log.info("计算获取每个人的假期额度 userQuotaMap:{}", userQuotaMap);
         // -- 获取用户的假期表
         List<Long> userIds = users.stream().map(AdminUserDO::getId).collect(Collectors.toList());
         Map<Long, AdminUserDO> userMap = users.stream().collect(Collectors.toMap(AdminUserDO::getId, a -> a));