From b219589d73f46bd98995bceb4caf16dadb56b869 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 12 九月 2025 20:30:13 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
index 946aeb5..c7fa7d3 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
@@ -81,7 +81,12 @@
@RequestMapping("/tLine_add")
public String tLineAdd(Model model) {
//站点
- List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
+ Integer companyId = null;
+ if(shiroExtUtil.getUser().getRoleType() != 1){
+ companyId = shiroExtUtil.getUser().getObjectId();
+ }
+ List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1)
+ .eq(null != companyId, "companyId", companyId));
model.addAttribute("siteList",siteList);
//跨城车型
List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
@@ -132,7 +137,12 @@
TLineSite end = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLineId).eq("type", 2));
model.addAttribute("end",end);
//站点
- List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
+ Integer companyId = null;
+ if(shiroExtUtil.getUser().getRoleType() != 1){
+ companyId = shiroExtUtil.getUser().getObjectId();
+ }
+ List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1)
+ .eq(null != companyId, "companyId", companyId));
model.addAttribute("siteList",siteList);
//跨城车型
List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
@@ -160,7 +170,11 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tLineService.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state, shiroExtUtil.getUser().getObjectId()));
+ Integer companyId = null;
+ if(shiroExtUtil.getUser().getRoleType() != 1){
+ companyId = shiroExtUtil.getUser().getObjectId();
+ }
+ page.setRecords(tLineService.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state, companyId));
return super.packForBT(page);
}
@@ -170,6 +184,7 @@
@RequestMapping(value = "/add")
@ResponseBody
public ResultUtil add(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {
+
String name = tLine.getName();
name = name.replaceAll("& lt;", "<");
name = name.replaceAll("& gt;", ">");
--
Gitblit v1.7.1