查询个人的邮件推送许可优化

src/main/java/com/cmeeting/ad/service/impl/UserServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cmeeting.ad.entity.*;
 import com.cmeeting.ad.util.SecurityUtil;
 import com.cmeeting.ad.vo.UserVo;
+import com.cmeeting.dto.UserDTO;
 import com.cmeeting.exception.RobotBaseException;
 import com.cmeeting.mapper.primary.CommonMapper;
 import com.cmeeting.ad.service.ILdapService;
@@ -18,10 +19,10 @@ import com.cmeeting.ad.util.JwtUtil;
 import com.cmeeting.constant.CategoryConstant;
 import com.cmeeting.constant.UserAdminRouteConstant;
 import com.cmeeting.mapper.secondary.SysUserSysMapper;
+import com.cmeeting.pojo.CoreModulePermissions;
 import com.cmeeting.util.*;
 import com.cmeeting.ad.vo.ApplicationUserVO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -29,11 +30,13 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -242,8 +245,8 @@ public class UserServiceImpl implements UserService {
         }
         JSONObject data = object.getJSONObject("data");
         RobotSecurityUser robotSecurityUser = JSON.parseObject(data.toJSONString(), RobotSecurityUser.class);
-
-        UserVo.Auth authParams = UserVo.Auth.builder().id(String.format("%08d", robotSecurityUser.getUserId())).nick(robotSecurityUser.getNickName()).build();
+        String userId = String.format("%08d", robotSecurityUser.getUserId());
+        UserVo.Auth authParams = UserVo.Auth.builder().id(userId).nick(robotSecurityUser.getNickName()).build();
         String token = auth(authParams);
         return token;
     }

src/main/java/com/cmeeting/email/EmailSender.java

@@ -202,6 +202,7 @@ public class EmailSender {
         } else{
             log.info("用户关闭了邮件推送，推送终止------");
             processLogService.log(meetingId,subMeetingId,"用户关闭了邮件推送，推送终止");
+            return false;
         }
 
         if(StringUtils.isEmpty(toEmail)){

src/main/java/com/cmeeting/job/CmeetingJob.java

@@ -49,10 +49,10 @@ public class CmeetingJob {
     public void tencentUserInit(){
         TencentUserSync();
     }
-//    @PostConstruct
-//    public void userBindInit(){
-//        userBind();
-//    }
+    @PostConstruct
+    public void userBindInit(){
+        userBind();
+    }
 
     /**
      * 企微人员定时同步

src/main/java/com/cmeeting/service/impl/WeComServiceImpl.java

@@ -219,9 +219,9 @@ public class WeComServiceImpl extends ServiceImpl<WeComUserMapper, WeComUser>  i
                 }
                 // 查询会议详情，获取主持人腾讯会议userid
                 String hostUserId = tencentMeetingService.getMeetingHost(meetingCode);
+                cancelMeeting(meetingId, weComToken); // 尝试取消无效会议
                 if (hostUserId == null || hostUserId.isEmpty()) {
                     log.error("获取主持人失败，跳过会议: " + meetingCode);
-                    cancelMeeting(meetingId, weComToken); // 尝试取消无效会议
                     continue;
                 }
                 UserId userId = UserId.builder().userName(user.getUserName()).wid(user.getUserId()).tid(hostUserId).build();