Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-11-17 a7e51f7d5d77a0019723c5dcf1a65599a4bf2b7b

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

@@ -51,7 +51,7 @@
    @PostMapping
    public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){
        comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName());
        comSanshuoExpertDTO.setAppId(getLoginUserInfo().getAppId());
        comSanshuoExpertDTO.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
        return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO);
    }

@@ -86,6 +86,7 @@
                      @RequestParam(value = "size",required = false)Integer size,
                      @RequestParam(value = "level",required = false)Integer level){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
    }

@@ -126,7 +127,7 @@
     * */
    @GetMapping("/expertShow")
    public R expertShow(){
        return comSanShuoExpertService.expertShow();
        return comSanShuoExpertService.expertShow(this.getLoginUserInfo().getAppId());
    }


@@ -145,7 +146,7 @@
    @GetMapping("/expertShowList")
    public R expertShowList(@RequestParam(value = "level",required = false)Integer level,
                            @RequestParam(value = "id",required = false)Long id){
        return comSanShuoExpertService.expertShowList(level,id);
        return comSanShuoExpertService.expertShowList(level,id,this.getLoginUserInfo().getAppId());
    }

    /**
@@ -180,8 +181,11 @@
    @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);
                            @RequestParam(value = "size",required = false)Integer size,
                            @RequestParam(value = "keyWord",required = false)String  keyWord){
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        loginUserInfo.setAppId(userService.detailUser(getLoginUserInfo().getUserId()).getData().getAppId());
        return comSanShuoExpertService.backstageList(level,loginUserInfo,page,size,keyWord);
    }