修改三说会堂列表报错

lidongdong

2023-10-23 2bfb9b7fe0ffdd1abe6a5a9529803ad60ae4e2e3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -150,6 +150,10 @@
            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);
        }
@@ -586,15 +590,15 @@
        }
        //上报级别是否匹配当前账号级别
        if (sysUser.getType().equals(12) ){
            if (!comEvent.getCurrentProcessType().equals(1)){
            if (comEvent.getCurrentProcessType()!=null && !comEvent.getCurrentProcessType().equals(1)){
                perm=0;
            }
        }else if (account.equals("admin")){
            if (!comEvent.getCurrentProcessType().equals(4)){
        }else if (StringUtils.equals("admin",account)){
            if ( comEvent.getCurrentProcessType()!=null && comEvent.getCurrentProcessType()!=4){
                perm=0;
            }
        }else if (isStreetAccount(sysUser)){
            if (!comEvent.getCurrentProcessType().equals(3)){
            if (comEvent.getCurrentProcessType()!=null && comEvent.getCurrentProcessType()!=3){
                perm=0;
            }
        }
@@ -962,8 +966,6 @@
        }
    }



    @Override
    @Transactional(rollbackFor = Exception.class)
    public R acceptRequest(Long id, Long specterId) {
@@ -1016,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);
@@ -1035,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);
            }