wangcheng 2 лет назад
Родитель
Сommit
499d539841

+ 7 - 4
launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewController.java

@@ -930,17 +930,16 @@ public class PlanNewController {
      * @return {@link Mono}<{@link RStatus}<{@link Paged}<{@link PlanNew}>>>
      */
     @PostMapping("planSelectSelf")
-    public Mono<RStatus<List<PlanNew>>> planSelectSelf(@RequestBody PosterTemSelectSelf request) {
+    public Mono<RStatus<List<SelectPlanRes1>>> planSelectSelf(@RequestBody PosterTemSelectSelf request) {
 
         if (Objects.isNull(request.getUserId())) {
             request.setUserId(BaseContextHandler.getUserId());
         }
         Criteria criteria = Criteria.where("create_id").is(request.getUserId()); // poster_template_id
-        if (Objects.nonNull(request.getName()) && "" != request.getName()) {
+        if (Objects.nonNull(request.getName()) && !request.getName().isEmpty()) {
             criteria = criteria.and("name").like("%" + request.getName() + "%");
         }
-        Mono<List<PlanNew>> listMono = template.select(Query.query(criteria), PlanNew.class).collectList();
-        return RStatus.successList(listMono);
+        return getPlanSelect(criteria);
     }
 
 
@@ -956,6 +955,10 @@ public class PlanNewController {
         if (Objects.nonNull(request.getName()) && "" != request.getName()) {
             criteria = criteria.and("name").is(request.getName());
         }
+        return getPlanSelect(criteria);
+    }
+
+    private Mono<RStatus<List<SelectPlanRes1>>> getPlanSelect( Criteria criteria) {
         Mono<List<SelectPlanRes1>> listMono = template.select(Query.query(criteria), PlanNew.class).flatMap(fm -> {
             SelectPlanRes1 selectPlanRes1 = new SelectPlanRes1();
             selectPlanRes1.setName(fm.name());