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 ++++++++++++++++++++++++++++--
ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 6 ++++--
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 5c12df7..0026117 100644
--- a/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -621,7 +621,7 @@
@ResponseBody
public Object add(TDriver tDriver,@RequestParam String serverBox,@RequestParam String lineStr,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
//判断登录账户是否重复
- int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3").ne("flag", 3));
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", Arrays.asList(1, 2, 3)).ne("flag", 3));
if (count > 0){
return "error";
}
@@ -769,7 +769,7 @@
TDriver obj = tDriverService.selectById(tDriver.getId());
if (!obj.getPhone().equals(tDriver.getPhone())){
//判断登录账户是否重复
- int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3"));
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", Arrays.asList(1, 2, 3)).ne("flag", 3));
if (count > 0){
return "error";
}
@@ -808,6 +808,8 @@
// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
if(ToolUtil.isNotEmpty(tDriver.getPassword())){
tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
+ }else{
+ tDriver.setPassword(null);
}
tDriverService.updateById(tDriver);
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