Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/job/AttenDanceWarnNoticeTask.java

@@ -73,6 +73,9 @@ public class AttenDanceWarnNoticeTask {
         //查询
 
         //根据规则中的用户id查询出所有绑定了微信的学生和教师
+        if(allTodyRule.isEmpty()){
+            return;
+        }
         List<XjrUser> userList = getUserList(allTodyRule.keySet());
         for (XjrUser xjrUser : userList) {
             AttendanceRuleDetails ruleDetails = allTodyRule.get(xjrUser.getId());
@@ -153,7 +156,7 @@ public class AttenDanceWarnNoticeTask {
     List<XjrUser> getUserList(Set<Long> userIds){
         return userService.list(
             new QueryWrapper<XjrUser>().lambda()
-            .eq(XjrUser::getId, userIds)
+            .in(XjrUser::getId, userIds)
             .isNotNull(XjrUser::getOpenId)
         );
     }