浏览代码

Merge branch 'fu-dev' of uskycloud/usky-cloud into master

hanzhengyi 23 小时之前
父节点
当前提交
9bb5414a04

+ 7 - 1
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -359,6 +359,7 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
             // 登录不需要新增消息记录
             if ("0".equals(mceRequestVO.getInfoType())) {
                 handleMessageDelivery(mbUser, mceRequestVO, 0, appMode, wcMode);
+                return;
             }
 
             // 创建消息接收记录
@@ -511,7 +512,12 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
      */
     private void sendWeChatMessage(MceMbuser mbUser, MceRequestVO mceRequestVO, JSONObject mode,
                                    String infoType, Integer mceReceiveId) {
-        if (mode.getBoolean(infoType) && mbUser.getOpenid() != null) {
+
+        if (mbUser.getOpenid() == null) {
+            return;
+        }
+
+        if ("0".equals(infoType) || mode.getBoolean(infoType)) {
             try {
                 mceContentService.sendAppNew(mceRequestVO, mbUser.getOpenid(), mceReceiveId, 1);
             } catch (Exception e) {