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

lidongdong

2022-10-19 ceba89443dc0f8240e5bebb0d6f708eb6947c9e7

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

@@ -172,9 +172,9 @@
                }
            }
        }
        if (loginUserInfo.getAccount().equals("admin") || loginUserInfo.getAccount().equals("xiqu")){
        if (loginUserInfo.getAccount().equals("admin") && isNull(level)){
            id=null;
            range=null;
            range=1;
        }
        IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level);
        for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) {