| | |
| | | BeanUtils.copyProperties(comEventVO, comEvent); |
| | | LoginUserInfoVO loginUserInfo = getLoginUserInfo(); |
| | | if (isNull(comEventVO.getAppId())){ |
| | | String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId(); |
| | | // String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId(); |
| | | String appId = getAppId(); |
| | | comEvent.setAppId(appId); |
| | | } |
| | | LoginUserInfoVO loginUserInfo1 = this.getLoginUserInfo(); |
| | | loginUserInfo1.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType()); |
| | | // loginUserInfo1.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType()); |
| | | loginUserInfo1.setType(loginUserInfo.getType()); |
| | | return comEventService.pageByComEvent(comEvent, pagination,loginUserInfo1); |
| | | } |
| | | |
| | |
| | | @GetMapping("/status/calculate") |
| | | public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id) { |
| | | LoginUserInfoVO loginUserInfo = getLoginUserInfo(); |
| | | loginUserInfo.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType()); |
| | | // loginUserInfo.setType(userService.detailUser(loginUserInfo.getUserId()).getData().getType()); |
| | | return comEventService.calculate(loginUserInfo,level,id); |
| | | } |
| | | |