Merge branch 'wyp/1211-articleDeleteFix' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticleAuditService.java

@@ -177,16 +177,6 @@ public class ArticleAuditService {
                 deleteFailAlarm(publishContentId, "无推送记录", 0);
                 continue;
             }
-            if (!publishGzhPushDTO.getPushType().equals(PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
-                PushTypeEnum pushTypeEnum = PushTypeEnum.from(publishGzhPushDTO.getPushType());
-                deleteFailAlarm(publishContentId, "推送类型为" + pushTypeEnum.getDescription(), 0);
-                continue;
-            }
-            String groupPushMsgId = pushIdMap.get(pushId);
-            if (!StringUtils.hasText(groupPushMsgId)) {
-                deleteFailAlarm(publishContentId, "无推送MsgId", 0);
-                continue;
-            }
             String publishAccountId = pushAccountMap.get(pushId);
             String ghId = publishAccountMap.get(publishAccountId);
             List<PublishGzhPushContentRelDTO> relList = groupPushRelMap.get(pushId).stream()
@@ -198,6 +188,16 @@ public class ArticleAuditService {
                     break;
                 }
             }
+            if (!publishGzhPushDTO.getPushType().equals(PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
+                PushTypeEnum pushTypeEnum = PushTypeEnum.from(publishGzhPushDTO.getPushType());
+                deleteFailAlarm(publishContentId, "推送类型为" + pushTypeEnum.getDescription(), index);
+                continue;
+            }
+            String groupPushMsgId = pushIdMap.get(pushId);
+            if (!StringUtils.hasText(groupPushMsgId)) {
+                deleteFailAlarm(publishContentId, "无推送MsgId", index);
+                continue;
+            }
             LongArticleAuditDelete delete = new LongArticleAuditDelete();
             delete.setGhId(ghId);
             delete.setMsgId(groupPushMsgId);