|
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<result property="updateBy" column="update_by" />
|
|
<result property="updateBy" column="update_by" />
|
|
<result property="updateTime" column="update_time" />
|
|
<result property="updateTime" column="update_time" />
|
|
<result property="remark" column="remark" />
|
|
<result property="remark" column="remark" />
|
|
|
|
+ <result property="openId" column="open_id" />
|
|
<association property="dept" javaType="SysDept" resultMap="deptResult" />
|
|
<association property="dept" javaType="SysDept" resultMap="deptResult" />
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
</resultMap>
|
|
</resultMap>
|
|
@@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
|
|
- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
|
|
|
|
|
|
+ select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.open_id from sys_user u
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
where u.del_flag = '0'
|
|
where u.del_flag = '0'
|
|
<if test="userId != null and userId != 0">
|
|
<if test="userId != null and userId != 0">
|
|
@@ -69,6 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<if test="status != null and status != ''">
|
|
<if test="status != null and status != ''">
|
|
AND u.status = #{status}
|
|
AND u.status = #{status}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="openId != null and openId != ''">
|
|
|
|
+ AND u.open_id = #{openId}
|
|
|
|
+ </if>
|
|
<if test="phonenumber != null and phonenumber != ''">
|
|
<if test="phonenumber != null and phonenumber != ''">
|
|
AND u.phonenumber like concat('%', #{phonenumber}, '%')
|
|
AND u.phonenumber like concat('%', #{phonenumber}, '%')
|
|
</if>
|
|
</if>
|