From 654dd616eb6d808b1484d56c207f5610ab335a8e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 10:29:19 +0800
Subject: [PATCH] 修改bug
---
ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java b/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
index 9f060a4..e8ca76b 100644
--- a/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
+++ b/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
@@ -26,6 +27,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 跨城线路管理控制器
@@ -63,6 +65,14 @@
@Autowired
private ITLineCompanyService itLineCompanyService;
+ @Autowired
+ private IUserService userService;
+
+
+
+
+
+
/**
* 跳转到跨城站点管理首页
*/
@@ -77,7 +87,15 @@
@RequestMapping("/tLine_add")
public String tLineAdd(Model model) {
//站点
- List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ Wrapper<TSite> wrapper = new EntityWrapper<TSite>().eq("state", 1);
+ if(roleType != 1){
+ List<User> users = userService.selectList(new EntityWrapper<User>().ne("roleType", 1).eq("objectId", objectId));
+ List<Integer> collect = users.stream().map(User::getId).collect(Collectors.toList());
+ wrapper.in("insertUserId", collect);
+ }
+ List<TSite> siteList = itSiteService.selectList(wrapper);
model.addAttribute("siteList",siteList);
//跨城车型
List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
@@ -116,7 +134,15 @@
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 objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ Wrapper<TSite> wrapper = new EntityWrapper<TSite>().eq("state", 1);
+ if(roleType != 1){
+ List<User> users = userService.selectList(new EntityWrapper<User>().ne("roleType", 1).eq("objectId", objectId));
+ List<Integer> collect = users.stream().map(User::getId).collect(Collectors.toList());
+ wrapper.in("insertUserId", collect);
+ }
+ List<TSite> siteList = itSiteService.selectList(wrapper);
model.addAttribute("siteList",siteList);
//跨城车型
List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
--
Gitblit v1.7.1