type6-v0.11

(cherry picked from commit aa866d719764aa7e84295e80cd9f58abe9b97980)

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

@@ -1361,12 +1361,12 @@ public class PlanNewCommonOutController {
                             //return Mono.just(new StringBuilder(s));
                         }
                         //saveRequest.setImportDomain(String.valueOf(saveRequest.getGroupId()));
-                        return getDomainSetV(groupId, planId,2, ff.code(),false);
+                        return getDomainSetV(groupId, planId,2, ff.code(),false,false);
                     }else {
                          if (3 == ff.type() || 4==ff.type()) {
-                            return getDomainSetV(groupId, planId,1, ff.code(),true);
+                            return getDomainSetV(groupId, planId,1, ff.code(),true,false);
                         }else {
-                            return getDomainSetV(groupId, planId,1, ff.code(),false);
+                            return getDomainSetV(groupId, planId,1, ff.code(),false,false);
                         }
                     }
 
@@ -1389,7 +1389,7 @@ public class PlanNewCommonOutController {
                     if (Objects.isNull(groupId)) {
                         return Mono.error(new BaseException("查询裂变计划 groupId 值为 null"));
                     }
-                    return getDomainSetV(groupId, planId,1, ff.code(),false);
+                    return getDomainSetV(groupId, planId,1, ff.code(),false,false);
                 });
     }
 
@@ -1416,11 +1416,11 @@ public class PlanNewCommonOutController {
                     }catch (Exception e){
                         return Mono.error(new BaseException("查询听书计划入口域名类型值解析错误"+e.getMessage()));
                     }
-                    return getDomainSetV(groupId, planId,1,ff.code(),false);
+                    return getDomainSetV(groupId, planId,1,ff.code(),false,true);
                 });
     }
 
-    private Mono<ByCodeGetImportDomainRes> getDomainSetV( Long  groupId, String planId,Integer type,String code,boolean isFri) {
+    private Mono<ByCodeGetImportDomainRes> getDomainSetV( Long  groupId, String planId,Integer type,String code,boolean isFri,boolean isAddGroup) {
         return template.select(Query.query(Criteria.where("group_type_id").is(groupId)
                         .and("status").is(1)
                         .and("type").is(type)
@@ -1452,10 +1452,12 @@ public class PlanNewCommonOutController {
                         }else {
                             stringBuilder.append("/index.html?code=");
                         }
-
                         stringBuilder.append(code);
                         stringBuilder.append("&sk=");
                         stringBuilder.append(IdUtil.fastSimpleUUID());
+                        if (isAddGroup) {
+                            stringBuilder.append("&id=57");
+                        }
                     }else {
                         return Mono.error(new BaseException(StrUtil.format("通过code:{},groupId:{}；查询域名Error::{}",code,groupId,"错误")));
                     }