From dda4a2cb96a275f811cce236cc83214b3b9f8964 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Mon, 2 Jan 2023 10:33:35 +0800 Subject: [PATCH] fix bug --- .../WxMsgValidationcodeModelController.java | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java index cd9a0814f..f6fad391f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -24,24 +24,23 @@ public class WxMsgValidationcodeModelController extends BaseController { @Autowired private WxMsgValidationcodeModelService wxMsgValidationcodeModelService; -// @ApiOperation("消息模板-列表") -// @GetMapping("list") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), -// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) -// @SystemControllerLog(description = "消息验证模板-列表") -// public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { -// logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); -// if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); -// wxMsgValidationcodeModel.updateTenantInfo(getTenantInfo()); -// PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); -// page.getList().forEach(m -> { -// for (EnumMsgModelReplace e : EnumMsgModelReplace.values()) { -// m.setContent(m.getContent().replace(e.getCode(),e.getMessage())); -// } -// }); -// return new ResultData(page); -// } + @ApiOperation("消息模板-列表") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "消息验证模板-列表") + public ResultData list(@ModelAttribute WxMsgValidationcodeModel wxMsgValidationcodeModel, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeModelController::list"); + if (null == wxMsgValidationcodeModel) wxMsgValidationcodeModel = new WxMsgValidationcodeModel(); + PageInfo page = wxMsgValidationcodeModelService.listAsPage(wxMsgValidationcodeModel, pageNum, pageSize); + page.getList().forEach(m -> { + for (EnumMsgModelReplace e : EnumMsgModelReplace.values()) { + m.setContent(m.getContent().replace(e.getCode(),e.getMessage())); + } + }); + return new ResultData(page); + } // // @ApiOperation("消息模板-添加") // @PostMapping("add")