From 30f124fbe2c638eecda3d74c6dde053af5d574f0 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期六, 11 十月 2025 14:26:17 +0800 Subject: [PATCH] 提交代码 --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java index 06d4769..7bb3100 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java @@ -58,13 +58,13 @@ String[] timeArray = startTime.split(" - "); Date startTimes = DateUtil.getDate_str3(timeArray[0]); Date endTimes = DateUtil.getDate_str3(timeArray[1]); - ShiroUser user = ShiroKit.getUser(); + ShiroUser user = shiroExtUtil.getUser(); Date nowDay = new Date(); //添加活动 DriverActivity driverActivity = new DriverActivity(); driverActivity.setInsertTime(nowDay); - driverActivity.setCompanyId(ShiroKit.getUser().getObjectId()); - driverActivity.setCompanyType(ShiroKit.getUser().getRoleType()); + driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId()); + driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType()); driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1); driverActivity.setName(num1); driverActivity.setStartTime(startTimes); @@ -139,14 +139,14 @@ String[] timeArray = startTime.split(" - "); Date startTimes = DateUtil.getDate_str3(timeArray[0]); Date endTimes = DateUtil.getDate_str3(timeArray[1]); - ShiroUser user = ShiroKit.getUser(); + ShiroUser user = shiroExtUtil.getUser(); Date nowDay = new Date(); //添加活动 DriverActivity driverActivity = new DriverActivity(); driverActivity.setId(id); - driverActivity.setCompanyId(ShiroKit.getUser().getObjectId()); - driverActivity.setCompanyType(ShiroKit.getUser().getRoleType()); + driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId()); + driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType()); driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1); driverActivity.setName(num1); driverActivity.setStartTime(startTimes); -- Gitblit v1.7.1