Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

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

@@ -217,8 +217,8 @@
     * 专家风采
     * */
    @Override
    public R expertShow() {
        List<ExpertShowVO> expertShowVOS = comSanshuoExpertDao.expertShow();
    public R expertShow(String appId) {
        List<ExpertShowVO> expertShowVOS = comSanshuoExpertDao.expertShow(appId);
        for (ExpertShowVO expertShowVO : expertShowVOS) {
            if (nonNull(expertShowVO.getLevel())){
                if (1==expertShowVO.getLevel()) {
@@ -234,7 +234,7 @@
                    expertShowVO.setChildList(expertShowVOS1);
                }else {
                    expertShowVO.setName("村/社区调解站调解专家");
                    List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity();
                    List<ExpertShowVO> expertShowVOS1 = comSanshuoExpertDao.selectExpertCommunity(appId);
                    expertShowVO.setChildList(expertShowVOS1);
                }
            }
@@ -349,9 +349,10 @@
     * 专家风采列表
     * */
    @Override
    public R expertShowList(Integer level, Long id) {
    public R expertShowList(Integer level, Long id,String appId) {
        QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
        wrapper.eq("level",level );
        wrapper.eq("level",level);
        wrapper.eq("app_id",appId);
        if (level.equals(2)){
            wrapper.eq("industry_center_id", id);
        }else if (level.equals(3)){
@@ -450,5 +451,33 @@
        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);
    }


}