|
@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<result property="userName" column="user_name" />
|
|
<result property="userName" column="user_name" />
|
|
<result property="nickName" column="nick_name" />
|
|
<result property="nickName" column="nick_name" />
|
|
<result property="userType" column="user_type" />
|
|
<result property="userType" column="user_type" />
|
|
|
|
+ <result property="initFace" column="init_face" />
|
|
<result property="email" column="email" />
|
|
<result property="email" column="email" />
|
|
<result property="phonenumber" column="phonenumber" />
|
|
<result property="phonenumber" column="phonenumber" />
|
|
<result property="sex" column="sex" />
|
|
<result property="sex" column="sex" />
|
|
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectUserVo">
|
|
<sql id="selectUserVo">
|
|
- select u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
|
|
|
|
+ select u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type,u.init_face, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
|
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
|
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
|
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
|
from sys_user u
|
|
from sys_user u
|
|
@@ -58,7 +59,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_type, 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_type,u.init_face, 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
|
|
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">
|
|
@@ -90,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
|
|
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
|
|
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type, u.email, u.phonenumber, u.status, u.create_time
|
|
|
|
|
|
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type,u.init_face, u.email, u.phonenumber, u.status, u.create_time
|
|
from sys_user u
|
|
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
|
|
left join sys_user_role ur on u.user_id = ur.user_id
|
|
left join sys_user_role ur on u.user_id = ur.user_id
|
|
@@ -107,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
|
|
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
|
|
- select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type, u.email, u.phonenumber, u.status, u.create_time
|
|
|
|
|
|
+ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type,u.init_face, u.email, u.phonenumber, u.status, u.create_time
|
|
from sys_user u
|
|
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
|
|
left join sys_user_role ur on u.user_id = ur.user_id
|
|
left join sys_user_role ur on u.user_id = ur.user_id
|
|
@@ -143,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="selectUserByPhonenumber" parameterType="String" resultMap="SysUserResult">
|
|
<select id="selectUserByPhonenumber" parameterType="String" resultMap="SysUserResult">
|
|
- select u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type, u.email, u.avatar, u.phonenumber, u.password,u.plaintext, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
|
|
|
|
+ select u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type,u.init_face, u.email, u.avatar, u.phonenumber, u.password,u.plaintext, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
|
|
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
|
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
|
|
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
|
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
|
|
from sys_user u
|
|
from sys_user u
|
|
@@ -164,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<if test="userName != null and userName != ''">user_name,</if>
|
|
<if test="userName != null and userName != ''">user_name,</if>
|
|
<if test="nickName != null and nickName != ''">nick_name,</if>
|
|
<if test="nickName != null and nickName != ''">nick_name,</if>
|
|
<if test="userType != null and userType != ''">user_type,</if>
|
|
<if test="userType != null and userType != ''">user_type,</if>
|
|
|
|
+ <if test="initFace != null and initFace != ''">init_face,,</if>
|
|
<if test="email != null and email != ''">email,</if>
|
|
<if test="email != null and email != ''">email,</if>
|
|
<if test="avatar != null and avatar != ''">avatar,</if>
|
|
<if test="avatar != null and avatar != ''">avatar,</if>
|
|
<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
|
|
<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
|
|
@@ -179,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<if test="userName != null and userName != ''">#{userName},</if>
|
|
<if test="userName != null and userName != ''">#{userName},</if>
|
|
<if test="nickName != null and nickName != ''">#{nickName},</if>
|
|
<if test="nickName != null and nickName != ''">#{nickName},</if>
|
|
<if test="userType != null and userType != ''">#{userType},</if>
|
|
<if test="userType != null and userType != ''">#{userType},</if>
|
|
|
|
+ <if test="initFace != null and initFace != ''">#{initFace},</if>
|
|
<if test="email != null and email != ''">#{email},</if>
|
|
<if test="email != null and email != ''">#{email},</if>
|
|
<if test="avatar != null and avatar != ''">#{avatar},</if>
|
|
<if test="avatar != null and avatar != ''">#{avatar},</if>
|
|
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
|
|
<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
|
|
@@ -198,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<if test="userName != null and userName != ''">user_name = #{userName},</if>
|
|
<if test="userName != null and userName != ''">user_name = #{userName},</if>
|
|
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
|
|
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
|
|
<if test="userType != null and userType != ''">user_type = #{userType},</if>
|
|
<if test="userType != null and userType != ''">user_type = #{userType},</if>
|
|
|
|
+ <if test="initFace != null and initFace != ''">init_face = #{initFace},</if>
|
|
<if test="email != null ">email = #{email},</if>
|
|
<if test="email != null ">email = #{email},</if>
|
|
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
|
|
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
|
|
<if test="sex != null and sex != ''">sex = #{sex},</if>
|
|
<if test="sex != null and sex != ''">sex = #{sex},</if>
|