plan-java v0.66

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

@@ -157,8 +157,14 @@ public class PlanNewOutController {
             Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1)
                     .and("deleted_at").isNull()), Domain.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"6"))).collectList());
             // //类型 1素材分类2清水分类
-            Mono<List<Image>> image = template.select(Query.query(Criteria.where("type")
-                    .is(1).and("deleted_at").isNull().and("group_type_id").is(group_type_id)), Image.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"7")))
+            Criteria criteria = Criteria.where("type")
+                    .is(1).and("deleted_at").isNull()
+                    .and("group_type_id").is(group_type_id);
+            if(planNew.pageLine()==1){
+                criteria =criteria.and("size_type").is(2);
+            }
+            Query query = Query.query(criteria);
+            Mono<List<Image>> image = template.select(query, Image.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"7")))
                     .collectList();
             Mono<List<Material>> text = template.select(Query.query(Criteria.where("type")
                     .is(4).and("deleted_at").isNull().and("group_type_id").is(group_type_id)), Material.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"8")))