From b63101272c43c01e6bf828b59d7d9c7e9d163983 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.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/TYouTuiController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
index b6c5251..5131910 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.JwtTokenUtil;
@@ -46,6 +47,9 @@
@Autowired
private ITBranchOfficeService branchOfficeService;
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到首页
*/
@@ -79,8 +83,8 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(String createTime,Integer type) {
- Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
- Integer companyId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ Integer roleType = Objects.requireNonNull(shiroExtUtil.getUser()).getRoleType();
+ Integer companyId = Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId();
EntityWrapper<TYouTui> wrapper = new EntityWrapper<>();
if(Objects.nonNull(type)){
@@ -130,7 +134,7 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TYouTui tYouTui) {
- tYouTui.setCompanyId(Objects.requireNonNull(ShiroKit.getUser()).getObjectId());
+ tYouTui.setCompanyId(Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId());
tYouTui.setContent(tYouTui.getServiceContent());
tYouTuiService.insert(tYouTui);
return SUCCESS_TIP;
--
Gitblit v1.7.1