Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-16 8d493a008ce655963f0363b116d5b55e02eff3d6

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

@@ -138,8 +138,10 @@
                expert.setStreetId(Long.parseLong(expert.getUnitId()));
                expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
            }else if(expert.getLevel()==4){
                if (nonNull(expert.getUnitId())){
                expert.setCommunityId(Long.parseLong(expert.getUnitId()));
                expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
                }
            }
            return R.ok(comSanshuoExpertDao.updateById(expert));
        }
@@ -427,24 +429,54 @@
    }

    @Override
    public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size) {
    public R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size,String keyWord) {
        if (nonNull(level)){
            if (level.equals(1)){
                //三说会堂权限，查看所有
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null ,loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,null ,loginUserInfoVO.getAppId(),keyWord));
            }else if (level.equals(2)){
                //行业分中心
                ComSanshuoIndustryCenter center = comSanshuoIndustryCenterDao.selectOne(new QueryWrapper<ComSanshuoIndustryCenter>().lambda().eq(ComSanshuoIndustryCenter::getAccount, loginUserInfoVO.getAccount()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId(),loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,center.getId(),loginUserInfoVO.getAppId(),keyWord));
            }else if (level.equals(3)){
                //街道
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId(),loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getStreetId(),loginUserInfoVO.getAppId(),keyWord));
            }else if(level.equals(4)){
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId()));
                return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId(),keyWord));
            }
        }else {
            return R.ok(comSanshuoExpertDao.expertList(new Page(page,size),level,loginUserInfoVO.getCommunityId(),loginUserInfoVO.getAppId(),keyWord));
        }
        return null;
    }

    @Override
    public R rangeList() {
        List<ExpertRangeVO> list=new ArrayList<>();
        for (int i = 1; i < 5; i++) {
            ExpertRangeVO vo=new ExpertRangeVO();
            vo.setLevel(i);
            if (i==2){
                //设置行业分中心为childList
                vo.setId(2L);
                vo.setChildList(comSanshuoIndustryCenterDao.indstryList());
                vo.setName("行业分中心");
            }else if (i==3){
                vo.setId(3L);
                vo.setChildList(comSanshuoIndustryCenterDao.streetList());
                vo.setName("街道调解站");
            }else if (i==4){
                vo.setId(4L);
                vo.setChildList(comSanshuoIndustryCenterDao.communityList());
                vo.setName("社区调解站");
            }else if(i==1){
                vo.setId(1L);
                vo.setName("三说会堂");
            }
            list.add(vo);
        }
        return R.ok(list);
    }


}