|
@@ -18,7 +18,7 @@
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="com.boman.domain.BomanGroupUser" id="BomanGroupUserResult">
|
|
<resultMap type="com.boman.domain.BomanGroupUser" id="BomanGroupUserResult">
|
|
- <id property="id" column="id"/>
|
|
|
|
|
|
+ <id property="id" column="g_u_id"/>
|
|
<result property="userId" column="user_id"/>
|
|
<result property="userId" column="user_id"/>
|
|
<result property="userName" column="user_name"/>
|
|
<result property="userName" column="user_name"/>
|
|
<result property="groupId" column="group_id"/>
|
|
<result property="groupId" column="group_id"/>
|
|
@@ -37,10 +37,10 @@
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
<select id="selectGroupList" parameterType="com.boman.domain.BomanGroup" resultMap="BomanGroupResult">
|
|
<select id="selectGroupList" parameterType="com.boman.domain.BomanGroup" resultMap="BomanGroupResult">
|
|
- select g.id, g.group_name, g.status, g.number, g.create_by, g.create_time, g.is_del, gu.user_name , gu.id
|
|
|
|
|
|
+ select g.id, g.group_name, g.status, g.number, g.create_by, g.create_time, g.is_del, gu.user_name , gu.id as g_u_id
|
|
from boman_group g
|
|
from boman_group g
|
|
left join boman_group_user gu on gu.group_id = g.id
|
|
left join boman_group_user gu on gu.group_id = g.id
|
|
- where g.is_del = 'N'
|
|
|
|
|
|
+ where gu.is_del = 'N'
|
|
<if test="groupName != null and groupName != ''">
|
|
<if test="groupName != null and groupName != ''">
|
|
AND g.group_name like concat('%', #{groupName}, '%')
|
|
AND g.group_name like concat('%', #{groupName}, '%')
|
|
</if>
|
|
</if>
|