Merge branch 'huacheng_test' into local_20221104

yanghui

2022-11-04 06180fa3c8ee17d731561b88897fa18b9f8cf228

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

@@ -82,10 +82,12 @@
    @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);
    }


    /**
     * 删除
@@ -127,9 +129,6 @@
    }





    /**
     * 专家范围
     * */
@@ -164,7 +163,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();
@@ -174,6 +173,17 @@
        return R.ok();
    }

    /**
     * 后台获取专家列表
     * */
    @GetMapping("/backstageList2")
    public R  backstageList(@RequestParam(value = "level",required = false)Integer level,
                            @RequestParam(value = "page",required = false)Integer page,
                            @RequestParam(value = "size",required = false)Integer size){
        return comSanShuoExpertService.backstageList(level,getLoginUserInfo(),page,size);
    }