优化查询条件

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<String,Object> listXmIterationMenu( @RequestParam Map<String,Object> xmIterationMenu){
-		Map<String,Object> m = new HashMap<>(); 
+		Map<String,Object> 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<Map<String,Object>>	xmIterationMenuList = xmIterationMenuService.selectListMapByWhere(xmIterationMenu);	//列出XmIterationMenu列表
 		PageUtils.responePage(m, xmIterationMenuList);
 		m.put("data",xmIterationMenuList);
-		Tips tips=new Tips("查询成功");
+
 		m.put("tips", tips);
 		return m;
 	}

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml

@@ -14,7 +14,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select res.*,m.menu_name,m.seq_no,m.pmenu_id from XM.xm_iteration_menu res left join XM.xm_menu m on m.menu_id=res.menu_id
+		select res.*,m.menu_name,m.seq_no,m.pmenu_id,m.mm_userid,m.mm_username from XM.xm_iteration_menu res left join XM.xm_menu m on m.menu_id=res.menu_id
 		<where> 
 			<if test="ids != null">  and     
 				id in