type6-v0.08

(cherry picked from commit e9459b62c50f10451f574d6f7fec3d6b1b04183f)

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

@@ -1336,10 +1336,10 @@ public class PlanNewCommonOutController {
                                         planId,
                                         throwable.getMessage()))))
                 .flatMap(ff -> {
-                    Long groupId = ff.groupId();
-                    if (Objects.isNull(groupId)) {
-                        return Mono.error(new BaseException("查询common计划 groupId 值为 null"));
+                    if (Objects.isNull(ff.importDomain())) {
+                        return Mono.error(new BaseException("查询common计划 importDomain 值为 null"));
                     }
+                    Long groupId = Long.valueOf(ff.importDomain());
                     if(Objects.nonNull(ff.type()) && 5==ff.type()){
                         String configJson = ff.configJson();
                         if(Objects.nonNull(configJson) ){
@@ -1363,7 +1363,7 @@ public class PlanNewCommonOutController {
                         //saveRequest.setImportDomain(String.valueOf(saveRequest.getGroupId()));
                         return getDomainSetV(groupId, planId,2, ff.code(),false);
                     }else {
-                        if (3 == ff.type()) {
+                         if (3 == ff.type()) {
                             return getDomainSetV(groupId, planId,1, ff.code(),true);
                         }else {
                             return getDomainSetV(groupId, planId,1, ff.code(),false);

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/otherServices/OtherServicesImpl.java

@@ -95,10 +95,10 @@ public class OtherServicesImpl implements   OtherServicesInterface {
                                         code,
                                         throwable.getMessage()))))
                 .flatMap(ff -> {
-                    Long groupId = ff.groupId();
-                    if (Objects.isNull(groupId)) {
-                        return Mono.error(new BaseException("查询common计划 groupId 值为 null"));
+                    if (Objects.isNull(ff.importDomain())) {
+                        return Mono.error(new BaseException("查询common计划 importDomain 值为 null"));
                     }
+                    Long groupId = Long.valueOf(ff.importDomain());
                     if(Objects.nonNull(ff.type()) && 5==ff.type()){
                         String configJson = ff.configJson();
                         if(Objects.nonNull(configJson) ){