| | |
| | | if (ids!=null && ids.size()>0 ){ |
| | | list = comEventMapper.pageByComEventExpert(ids, comEvent, pagination); |
| | | } |
| | | else |
| | | { |
| | | list = comEventMapper.pageByComEventExpert(null, comEvent, pagination); |
| | | } |
| | | }else{ |
| | | list = baseMapper.pageByComEvent(comEvent, pagination); |
| | | } |
| | | if (list.getRecords().size() < 1) { |
| | | if (list==null || list.getRecords().size() < 1) { |
| | | return R.ok(Collections.emptyList()); |
| | | } |
| | | list.getRecords().forEach(comEvent1 -> { |
| | |
| | | } |
| | | } |
| | | |
| | | |
| | | |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public R acceptRequest(Long id, Long specterId) { |
| | |
| | | comEvent.setSpecialistId(expert.getId()); |
| | | isExpertCheck=true; |
| | | expertId=expert.getId(); |
| | | // level=expert.getLevel(); |
| | | // id=expert.getCommunityId(); |
| | | comEvent.setCommunityId(expert.getCommunityId()); |
| | | } |
| | | |
| | | |
| | | }else if (loginUserInfoVO.getType().equals(12)){ |
| | | //行业分中心权限 |
| | | comEvent.setUserType(3); |
| | |
| | | List<Long> cids = comActDAO.selectCommunityByStreetId(loginUserInfoVO.getStreetId()); |
| | | comEvent.setUserType(5); |
| | | comEvent.setCommunityIds(cids); |
| | | } |
| | | } |
| | | if (isExpertCheck){ |
| | | if(nonNull(comEventMapper.listEventIds(expertId))){ |
| | | List<Long> eventIds = comEventMapper.listEventIds(expertId); |
| | | List<Long> eventIds = comEventMapper.listEventIds(expertId); |
| | | if(eventIds!=null && eventIds.size()>0){ |
| | | |
| | | //获取该专家的所有事件 |
| | | comEvent.setEventIds(eventIds); |
| | | } |