|
|
@@ -926,7 +926,7 @@ public class GoGenerateService {
|
|
|
public Mono<StringBuilder> byPlanNewIdGetUrl(Long planNewId, Boolean isQs) {
|
|
|
return template.selectOne(Query.query(Criteria.where("plan_new_id").is(planNewId)), PlanNew.class)
|
|
|
.flatMap(f -> Mono.zip(Mono.just(f), template.select(Query.query(Criteria
|
|
|
- .where("group_type_id").is(isQs ? f.groupIdQs() : f.groupId())
|
|
|
+ .where("group_type_id").is(isQs ? f.groupIdQs() : StrUtil.isEmpty(f.importDomain()) ? f.groupId() : f.importDomain())
|
|
|
.and("status").is(1)
|
|
|
.and("type").is(1)
|
|
|
.and("group_type").is(isQs ? 2 : 1)
|