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

lidongdong

2022-11-23 8f9845717f6989792e2a6003adf5fe12ff0a9540

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

@@ -266,7 +266,7 @@
                    }else if (i==4){
                        vo.setId(4L);
                        vo.setChildList(comSanshuoIndustryCenterDao.communityList());
                        vo.setName("社区调解站");
                        vo.setName("社区调解室");
                    }else if(i==1){
                        vo.setId(1L);
                        vo.setName("三说会堂");
@@ -297,7 +297,7 @@
                List<ExpertRangeVO> list = new ArrayList<>();
                ExpertRangeVO vo = new ExpertRangeVO();
                vo.setLevel(4);
                vo.setName(comStreetDO.getName() + "调解站");
                vo.setName(comStreetDO.getName() + "调解室");
                vo.setId(loginUserInfo.getCommunityId());
                list.add(vo);
                return R.ok(list);
@@ -351,16 +351,24 @@
    @Override
    public R expertShowList(Integer level, Long id,String appId) {
        QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
        wrapper.eq("level",level);
        wrapper.eq("app_id",appId);
        wrapper.eq("status",1 );
        wrapper.eq("del_flag",1 );
        if (level.equals(2)){
            wrapper.eq("industry_center_id", id);
        }else if (level.equals(3)){
            wrapper.eq("street_id",id );
        }else if (level.equals(4)){
            wrapper.eq("community_id",id );
        if (level==0){
            wrapper.eq("app_id",appId );
        }else {
            if (level!=7){
                wrapper.eq("level",level);
                wrapper.eq("app_id",appId);
                wrapper.eq("status",1 );
                wrapper.eq("del_flag",1 );
                if (level.equals(2)){
                    wrapper.eq("industry_center_id", id);
                }else if (level.equals(3)){
                    wrapper.eq("street_id",id );
                }else if (level.equals(4)){
                    wrapper.eq("community_id",id );
                }
            }else {
                wrapper.eq("id",id );
            }
        }
        List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(wrapper);
        for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) {