diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java
index 3ba47ca0..4817fd88 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java
@@ -94,7 +94,7 @@ public class RemindJob {
         }
         List<SubscribeMessageReqDTO> dtos = new ArrayList<>();
         for (AdminOauthUserOtherInfoDO user : list) {
-            AttendanceWorkDTO attendanceWorkDTO = map.get(user.getId());
+            AttendanceWorkDTO attendanceWorkDTO = map.get(user.getUserId());
             SubscribeMessageReqDTO dto = new WxMaMsgTemplateUtils().convertCheckInReminder(new CheckInReminderDTO()
                     .setOpenId(user.getOpenId())
                     .setCheckInType(attendanceWorkDTO.getWorkTypeStr())
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
index 19b9688e..9c007dab 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
@@ -86,7 +86,7 @@ public class BirthdayJob {
             if (CollectionUtil.isNotEmpty(userIds)) {
                 list = adminOauthUserOtherInfoService.getOpenIdByCondition(new AdminOauthUserOtherInfoDTO()
                         .setSocialType(SocialTypeEnum.WECHAT_MINI_APP.getType())
-                        .setUserIds(new ArrayList<>()));
+                        .setUserIds(new ArrayList<>(userIds)));
             }
             // 生日提醒
             birthdayRemind(list);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml
index f8d746e7..30b1da8e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml
@@ -44,13 +44,13 @@
             <if test="dto.userType != null">
                 and b.user_type = #{dto.userType}
             </if>
-            <if test="dto.deptIds != null">
+            <if test="dto.deptIds != null and dto.deptIds.size() > 0">
                 and b.dept_id in
                 <foreach collection="dto.deptIds" item="deptId" open="(" close=")" separator=",">
                     #{deptId}
                 </foreach>
             </if>
-            <if test="dto.userIds != null">
+            <if test="dto.userIds != null and dto.userIds() > 0">
                 and b.id in
                 <foreach collection="dto.userIds" item="userId" open="(" close=")" separator=",">
                     #{userId}