Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-19 3a505ba8b2b27b16e355087c0b109b048f8c03a3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java

@@ -82,9 +82,10 @@
    @GetMapping("/backstageList")
    public R backList(@RequestParam(value = "keyWord",required = false) String keyWord,
                      @RequestParam(value = "page",required = false)Integer page,
                      @RequestParam(value = "size",required = false)Integer size){
                      @RequestParam(value = "size",required = false)Integer size,
                      @RequestParam(value = "level",required = false)Integer level){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo);
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
    }

    /**
@@ -164,7 +165,7 @@
     * 导入专家信息
     * */
    @PostMapping("/importExpert")
    public R importExpert(MultipartFile multipartFile){
    public R importExpert(@RequestBody MultipartFile multipartFile){
        try {
            ExcelListener listener=new ExcelListener(comSanShuoExpertService);
            EasyExcel.read(multipartFile.getInputStream(),ComSanshuoExpert.class,listener).sheet().doRead();