Pu Zhibing
4 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
@@ -59,13 +60,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);
@@ -140,14 +141,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);