提交代码

Pu Zhibing

9 小时以前 55132b44cd49f2a312a8fb2523ffda35a7485fd7

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java

@@ -64,12 +64,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 +168,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);