From f2530067b6cd16a87b76190cf524d2ed75bf9592 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:54 +0800
Subject: [PATCH] 集成中台及正联功能
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
index 8260760..f4ee736 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.JwtTokenUtil;
@@ -84,6 +85,9 @@
@Value("${filePath}")
private String filePath;
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
/**
* 跳转到首页
@@ -171,7 +175,7 @@
*/
@RequestMapping("/addOrder")
public String addOrder(Model model) {
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
if(objectId==1){
// 地图默认展示柳州区
model.addAttribute("lon",104.043246);
@@ -267,7 +271,7 @@
// return null;
// }
// JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
List<TDriver> tDrivers = new ArrayList<>();
//找到中心点
@@ -288,7 +292,7 @@
if (roleType==2){
tDrivers = driverService.selectList(new EntityWrapper<TDriver>().in("id", driverIds)
.eq("serverStatus",1)
- .eq("branchOfficeId", ShiroKit.getUser().getObjectId()));
+ .eq("branchOfficeId", shiroExtUtil.getUser().getObjectId()));
}else{
tDrivers = driverService.selectList(new EntityWrapper<TDriver>()
.eq("serverStatus",1).in("id", driverIds));
--
Gitblit v1.7.1