From e2eda11169da0655e717328bb6a02bbd7d78a5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 24 Feb 2022 18:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
index a52dd4ec..4ab51406 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
@@ -46,7 +46,7 @@
 		where t.menu_id=#{menuId} and te.status !='8' and te.status !='7'
 	</select>
 	<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
-		select res.*,s.* from xm_menu res left join xm_menu_state s on res.menu_id=s.menu_id
+		select res.*,s.*,i.iteration_name from xm_menu res left join xm_menu_state s on res.menu_id=s.menu_id left join xm_iteration i on res.iteration_id=i.id
 		<where>
 			<include refid="whereForMap"/>
 			<include refid="where"/>
@@ -122,7 +122,7 @@
 	
 	<!-- 通过条件查询获取数据列表 返回list<map> -->
 	<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
-		select * from xm_menu res
+		select * from xm_menu res left join xm_iteration i on res.iteration_id=i.id
 		<where>
 		    <include refid="whereForMap"/>
 			<include refid="where"/>