From ffe705d1fe2c4fa60d457f94b3e2be0cfeaf24c0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 15 六月 2025 01:58:30 +0800
Subject: [PATCH] 修改功能

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarRentalServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarRentalServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarRentalServiceImpl.java
index 3352526..548d313 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarRentalServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarRentalServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.CarRentalMapper;
@@ -35,7 +36,7 @@
 
     @Override
     public Map<String, Object> list(String createTime, String title, Integer brandId, String insertUser, List<Integer> status, Integer userType, Integer offset, Integer limit) throws Exception {
-        Integer companyId = ShiroKit.getUser().getRoleType() == 1 ? null : ShiroKit.getUser().getObjectId();
+        Integer companyId = ShiroExtUtil.getUser().getRoleType() == 1 ? null : ShiroExtUtil.getUser().getObjectId();
         String start = "";
         String end = "";
         if(ToolUtil.isNotEmpty(createTime)){
@@ -54,7 +55,7 @@
     @Override
     public ResultUtil addCarRental(CarRental carRental) throws Exception {
         carRental.setUserType(3);
-        carRental.setUserId(ShiroKit.getUser().getObjectId());
+        carRental.setUserId(ShiroExtUtil.getUser().getObjectId());
         TCarBrand tCarBrand = carBrandService.selectById(carRental.getBrandId());
         carRental.setBrandName(tCarBrand.getName());
         TRegion region = regionService.selectOne(new EntityWrapper<TRegion>().eq("code", carRental.getProvinceCode()));
@@ -63,8 +64,8 @@
         carRental.setCityName(region.getName());
         carRental.setCreateTime(new Date());
         carRental.setFirstPageShow(2);
-        carRental.setInsertUser(ShiroKit.getUser().getId());
-        if(ShiroKit.getUser().getRoleType() == 1 && carRental.getStatus() == 1){
+        carRental.setInsertUser(ShiroExtUtil.getUser().getId());
+        if (ShiroExtUtil.getUser().getRoleType() == 1 && carRental.getStatus() == 1) {
             carRental.setStatus(4);
         }
         this.insert(carRental);

--
Gitblit v1.7.1