From 4228f5ad9bd93c9184c31591a7da8878bb8791b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 17 Jun 2021 17:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmIterationMenuController.java | 12 ++++++++++-- .../mapper/xm/core/dao/XmIterationMenuMapper.xml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java index f16d30e0..8673ab33 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java @@ -69,13 +69,21 @@ public class XmIterationMenuController { }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmIterationMenu( @RequestParam Map xmIterationMenu){ - Map m = new HashMap<>(); + Map m = new HashMap<>(); + Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmIterationMenu, "ids"); PageUtils.startPage(xmIterationMenu); + String iterationId=(String)xmIterationMenu.get("iterationId"); + String menuId=(String)xmIterationMenu.get("menuId"); + if(!(StringUtils.hasText(iterationId)||StringUtils.hasText(menuId))){ + tips.setFailureMsg("迭代编号iterationId、故事编号menuId最少一个不能为空"); + m.put("tips", tips); + return m; + } List> xmIterationMenuList = xmIterationMenuService.selectListMapByWhere(xmIterationMenu); //列出XmIterationMenu列表 PageUtils.responePage(m, xmIterationMenuList); m.put("data",xmIterationMenuList); - Tips tips=new Tips("查询成功"); + m.put("tips", tips); return m; } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml index dbdb4629..fb2cff47 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml @@ -14,7 +14,7 @@