From 3ceabc2e7cb476ff68ce4f028c6da88580425d91 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Thu, 5 Dec 2024 17:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B6=88=E6=81=AF=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E6=8F=90=E9=86=92bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subscribe/SubscribeMessageSendApiImpl.java  | 17 +++++++++++------
 .../AdminOauthUserOtherInfoServiceImpl.java     |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java
index 5e396ba2..e4bed3c7 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/subscribe/SubscribeMessageSendApiImpl.java
@@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.common.template.vo.MsgData;
 import cn.iocoder.yudao.framework.common.template.vo.SubscribeMessageReqDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialClientDO;
 import cn.iocoder.yudao.module.system.service.social.SocialClientService;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
@@ -33,20 +32,26 @@ public class SubscribeMessageSendApiImpl implements SubscribeMessageSendApi {
     @Resource
     private SocialClientService socialClientService;
 
-    @SneakyThrows
     @Override
     public CommonResult<Long> sendMaMsg(SubscribeMessageReqDTO reqDTO) {
-        //发送审批结果通知
-        socialClientService.getWxMaService(reqDTO.getSocialType()).getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO));
+        try {
+            //发送审批结果通知
+            socialClientService.getWxMaService(reqDTO.getSocialType()).getMsgService().sendSubscribeMsg(initWxMaSubscribeMessage(reqDTO));
+        } catch (Exception e) {
+            log.error("发送小程序订阅消息失败:{}", e.getMessage());
+        }
         return success(1L);
     }
 
     @Override
-    @SneakyThrows
     public CommonResult<Long> sendMpMsg(SubscribeMessageReqDTO reqDTO) {
         // -- 公众号 点击 跳转 小程序 - 需要获取到小程序appId
         // 判断是否需要跳转小程序 - 通过
-        socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO));
+        try {
+            socialClientService.getWxMpService().getTemplateMsgService().sendTemplateMsg(initWxMpSubscribeMessage(reqDTO));
+        } catch (Exception e) {
+            log.error("发送公众号消息失败:{}", e.getMessage());
+        }
         return success(1L);
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminOauthUserOtherInfoServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminOauthUserOtherInfoServiceImpl.java
index b3c749cc..7e067f18 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminOauthUserOtherInfoServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminOauthUserOtherInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.service.auth;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.module.system.dal.dataobject.auth.AdminOauthUserOtherInfoDO;
 import cn.iocoder.yudao.module.system.dal.mysql.auth.AdminOauthUserOtherInfoMapper;
 import cn.iocoder.yudao.module.system.service.auth.dto.AdminOauthUserOtherInfoDTO;
@@ -8,6 +9,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 /**