1

module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java

@@ -161,6 +161,15 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .eq(PopularizeActivity::getState,state)
                     .orderByDesc(PopularizeActivity::getCreateTime)
                     .page(page);
+            if(StringUtils.isNotBlank(title)){
+                page1 = popularizeActivityService
+                        .lambdaQuery()
+                        .eq(PopularizeActivity::getCityId,cityId)
+                        .like(PopularizeActivity::getTitle,title)
+                        .eq(PopularizeActivity::getState,state)
+                        .orderByDesc(PopularizeActivity::getCreateTime)
+                        .page(page);
+            }
         }
 
 
@@ -275,6 +284,15 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .eq(PopularizeTravel::getState,state)
                     .orderByDesc(PopularizeTravel::getCreateTime)
                     .page(page);
+            //如果标题不为空
+            if(StringUtils.isNotBlank(title)){
+                page1 = popularizeTravelService
+                        .lambdaQuery()
+                        .like(PopularizeTravel::getTitle,title)
+                        .eq(PopularizeTravel::getState,state)
+                        .orderByDesc(PopularizeTravel::getCreateTime)
+                        .page(page);
+            }
         }
 
         //得到集合
@@ -1108,9 +1126,9 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 .eq(PopularizeOrder::getTravelOrderId, id)
                 .eq(PopularizeOrder::getState, "1")
                 .count();
-        if(count>=byId.getNum()){
-            return Result.error("报名人数已满,请不要重复报名！");
-        }
+//        if(count>=byId.getNum()){
+//            return Result.error("报名人数已满,请不要重复报名！");
+//        }
 
         //创建订单
         BigDecimal payPrice = byId.getPrice();