From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java
index be3e554..d80b9e2 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/LineController.java
@@ -5,6 +5,7 @@
import com.stylefeng.guns.core.support.WafKit;
import com.stylefeng.guns.modular.crossCity.model.Line;
import com.stylefeng.guns.modular.crossCity.model.LineSite;
+import com.stylefeng.guns.modular.crossCity.model.Site;
import com.stylefeng.guns.modular.crossCity.server.ILineService;
import com.stylefeng.guns.modular.crossCity.server.ILineSiteService;
import com.stylefeng.guns.modular.crossCity.server.ISiteService;
@@ -23,8 +24,10 @@
import org.springframework.web.bind.annotation.RestController;
import java.sql.Wrapper;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Vector;
/**
* 线路控制器
@@ -69,10 +72,12 @@
for (Line line : isOpen) {
List<LineSite> lineId = lineSiteService.selectList(new EntityWrapper<LineSite>().eq("lineId", line.getId()));
+ List<Site> sites =new ArrayList<>();
for (LineSite lineSite : lineId) {
- siteService.selectById(lineSite.getSiteId());
+ Site site = siteService.selectById(lineSite.getSiteId());
+ sites.add(site);
}
-
+ line.setSites(sites);
}
return ResultUtil.success(isOpen);
--
Gitblit v1.7.1