lidongdong
2023-09-05 3eaf6f0fc570c34b84c1981db711c75be7069b7f
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -98,7 +98,7 @@
        Boolean isExpertCheck=false;
        Long expertId=null;
        Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
//        comEvent.setAppId(loginUserInfoVO.getAppId());
        comEvent.setAppId(loginUserInfoVO.getAppId());
        if (nonNull(comEvent.getUserType())){
            if (comEvent.getUserType().equals(1)){
                //个人账号权限
@@ -146,13 +146,18 @@
        IPage<ComEvent> list=null;
        //是否为专家查看自己发布的事件
        if (isExpertCheck && comEvent.getUserType()!=1){
            if (nonNull(comEventMapper.listEventIds(expertId))){
                list = comEventMapper.pageByComEventExpert(comEventMapper.listEventIds(expertId), comEvent, pagination);
            List<Long> ids=comEventMapper.listEventIds(expertId);
            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 -> {
@@ -164,8 +169,8 @@
            }
            ComMediateType category = commediateTypeService.getById(comEvent1.getEventCategory());
            comEvent1.setEventCategoryName(category.getName());
//            comEvent1.setHasPerm(hasPermission(comEvent1,loginUserInfoVO ));
//            this.accountMenu(comEvent1,comEvent.getUserType(),loginUserInfoVO,isStretAccount);
            comEvent1.setHasPerm(hasPermission(comEvent1,loginUserInfoVO ));
            this.accountMenu(comEvent1,comEvent.getUserType(),loginUserInfoVO,isStretAccount);
            });
        return R.ok(list);
    }
@@ -961,8 +966,6 @@
        }
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R acceptRequest(Long id, Long specterId) {
@@ -1015,7 +1018,12 @@
                    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);
@@ -1034,10 +1042,11 @@
                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);
            }