fix: 域名过滤删除

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewCommonOutController.java

@@ -322,7 +322,8 @@ public class PlanNewCommonOutController {
             Mono<String> stringMono2 = template.select(Query.query(Criteria
                             .where("group_type_id").is(f.landingPageDomain())
                             .and("status").is(1)
-                            .and("type").is(request.getType())), DomainSelect.class)
+                            .and("type").is(request.getType())
+                            .and("deleted_at").isNull()), DomainSelect.class)
                     .switchIfEmpty(Mono.error(new BaseException("查询domain 返回结果为空")))
                     .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList().flatMap(fm -> {
                         //  DomainSelectRes domainSelectRes = new DomainSelectRes();
@@ -355,7 +356,8 @@ public class PlanNewCommonOutController {
         Mono<DomainSelectRes> domainSelectResMono1 = code1.flatMap(f -> template.select(Query.query(Criteria
                         .where("group_type_id").is(f.groupId())
                         .and("status").is(1)
-                        .and("type").is(request.getType())), DomainSelect.class)
+                        .and("type").is(request.getType())
+                        .and("deleted_at").isNull()), DomainSelect.class)
                 .switchIfEmpty(Mono.error(new BaseException("查询domain 返回结果为空")))
                 .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList()
                 .flatMap(fm -> {
@@ -379,7 +381,8 @@ public class PlanNewCommonOutController {
         if (StrUtil.isBlank(request.getLandingPageDomain()) || request.getLandingPageDomain().trim().isEmpty()) {
             stringMono = Mono.just(" ");
         } else {
-            stringMono = template.select(Query.query(Criteria.where("group_type_id").is(request.getLandingPageDomain())
+            stringMono = template.select(Query.query(Criteria
+                            .where("group_type_id").is(request.getLandingPageDomain())
                             .and("status").is(1)
                             .and("deleted_at").isNull()
                             .and("type").is(request.getType())), DomainSelect.class)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewOutController.java

@@ -128,7 +128,7 @@ public class PlanNewOutController {
                     stringMono1 =  Mono.just(" ");
                 }
                 Mono<String> stringMono2 = template.select(Query.query(Criteria.where("group_type_id").is(f.landingPageDomain())
-                        .and("status").is(1).and("type").is(type)), DomainSelect.class)
+                        .and("status").is(1).and("type").is(type).and("deleted_at").isNull()), DomainSelect.class)
                         .switchIfEmpty(Mono.error(new BaseException("查询domain 返回结果为空")))
                         .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList().flatMap(fm -> {
                           //  DomainSelectRes domainSelectRes = new DomainSelectRes();
@@ -160,7 +160,7 @@ public class PlanNewOutController {
                     .switchIfEmpty(Mono.error(new BaseException("计划code异常 返回结果为空"))) //Mono.error(new BaseException("查询海报模版 id:"+f.posterTemplateId()+"=>空"))
                     .onErrorResume(throwable -> Mono.error(new Exception(  throwable.getMessage())));
             Mono<DomainSelectRes> domainSelectResMono1 = code1.flatMap(f -> template.select(Query.query(Criteria.where("group_type_id").is(f.groupId())
-                    .and("status").is(1).and("type").is(type)), DomainSelect.class)
+                    .and("status").is(1).and("type").is(type).and("deleted_at").isNull()), DomainSelect.class)
                     .switchIfEmpty(Mono.error(new BaseException("查询domain 返回结果为空")))
                     .onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()))).collectList().flatMap(fm -> {
                         DomainSelectRes domainSelectRes = new DomainSelectRes();