Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/controller/AutomessageCommonProblemController.java

@@ -85,15 +85,23 @@
    }



    /**
     * 获取常见问题列表（不分页查找）
     * 获取常见问题列表（分页）
     * @param title
     * @param content
     * @return
     */
    @ApiOperation(value = "获取常见问题列表（不分页查找）",response = AutomessageCommonProblem.class)
    @GetMapping("/queryList")
    public ResultData queryList(@RequestParam(value = "title",required = false) String title){
        return  ResultData.success(iAutomessageCommonProblemService.selectConfigList(title,null));
    @ApiOperation(value = "获取常见问题列表（分页）(不加token)",response = AutomessageCommonProblem.class)
    @GetMapping("/selectConfigListNoToken")
    public TableDataInfo selectConfigListNoToken(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "title",required = false) String title,
                                          @RequestParam(value = "content",required = false) String content){
        Page<AutomessageCommonProblem> pageParam = new Page<>(pageNum,pageSize);
        List<AutomessageCommonProblem> list = iAutomessageCommonProblemService.selectConfigList(pageParam,pageSize,title,content);
        int num=iAutomessageCommonProblemService.countAutomessageCommonProblem(title,content);
        return getDataTable(list,num);
    }


}