|
|
@@ -15,6 +15,7 @@
|
|
|
<result property="updateBy" column="update_by"/>
|
|
|
<result property="openId" column="open_id"/>
|
|
|
<result property="companyId" column="company_id"/>
|
|
|
+ <result property="companyName" column="company_name"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap id="UserVOMap" type="com.jpsoft.employment.modules.sys.entity.UserVO" extends="UserMap">
|
|
|
@@ -102,8 +103,10 @@
|
|
|
</select>
|
|
|
<select id="search" parameterType="hashmap" resultMap="UserMap">
|
|
|
<![CDATA[
|
|
|
- select a.*
|
|
|
+ select a.*,
|
|
|
+ b.name_ as company_name
|
|
|
from sys_user a
|
|
|
+ left join base_company b on a.company_id = b.id_
|
|
|
where a.del_flag = 0
|
|
|
]]>
|
|
|
<if test="searchParams.userName != null">
|
|
|
@@ -112,6 +115,9 @@
|
|
|
<if test="searchParams.realName != null">
|
|
|
and a.real_name like #{searchParams.realName}
|
|
|
</if>
|
|
|
+ <if test="searchParams.companyId != null">
|
|
|
+ and a.company_id = #{searchParams.companyId}
|
|
|
+ </if>
|
|
|
<if test="searchParams.roleId != null">
|
|
|
and a.id_ in (select c.user_id from sys_user_role c where c.role_id = #{searchParams.roleId})
|
|
|
</if>
|
xiao547607