Pu Zhibing
4 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -64,12 +65,12 @@
            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();
            UserActivity userActivity = new UserActivity();
            userActivity.setInsertTime(nowDay);
            userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
            userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
            userActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            userActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
            userActivity.setName(name);
            userActivity.setStartTime(startTimes);
@@ -168,13 +169,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();
            UserActivity userActivity = new UserActivity();
            userActivity.setId(id);
            userActivity.setInsertTime(nowDay);
            userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
            userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
            userActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            userActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
            userActivity.setName(name);
            userActivity.setStartTime(startTimes);