|
|
@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
<result property="updateTime" column="update_time" />
|
|
|
|
<result property="updateTime" column="update_time" />
|
|
|
|
<result property="remark" column="remark" />
|
|
|
|
<result property="remark" column="remark" />
|
|
|
|
<result property="wxId" column="wx_id"/>
|
|
|
|
<result property="wxId" column="wx_id"/>
|
|
|
|
|
|
|
|
<result property="userMType" column="user_m_type"/>
|
|
|
|
|
|
|
|
|
|
|
|
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
|
|
|
|
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
|
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
|
|
|
|
|
|
|
|
|
@ -51,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
<sql id="selectUserVo">
|
|
|
|
<sql id="selectUserVo">
|
|
|
|
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password,
|
|
|
|
select u.user_id, u.dept_id, u.user_name, u.nick_name, 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, u.wx_id,
|
|
|
|
u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.wx_id,
|
|
|
|
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,u.user_m_type,
|
|
|
|
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
|
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
|
left join sys_dept d on u.dept_id = d.dept_id
|
|
|
@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
|
|
<if test="remark != null and remark != ''">remark,</if>
|
|
|
|
<if test="remark != null and remark != ''">remark,</if>
|
|
|
|
<if test="wxId != null and wxId != ''">wx_id,</if>
|
|
|
|
<if test="wxId != null and wxId != ''">wx_id,</if>
|
|
|
|
|
|
|
|
<if test="userMType != null and userMType != ''">user_m_type,</if>
|
|
|
|
create_time
|
|
|
|
create_time
|
|
|
|
)values(
|
|
|
|
)values(
|
|
|
|
<if test="userId != null and userId != ''">#{userId},</if>
|
|
|
|
<if test="userId != null and userId != ''">#{userId},</if>
|
|
|
@ -183,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
|
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
|
|
|
<if test="remark != null and remark != ''">#{remark},</if>
|
|
|
|
<if test="remark != null and remark != ''">#{remark},</if>
|
|
|
|
<if test="wxId != null and wxId != ''">#{wxId},</if>
|
|
|
|
<if test="wxId != null and wxId != ''">#{wxId},</if>
|
|
|
|
|
|
|
|
<if test="userMType != null and userMType != ''">#{userMType},</if>
|
|
|
|
GETDATE()
|
|
|
|
GETDATE()
|
|
|
|
)
|
|
|
|
)
|
|
|
|
</insert>
|
|
|
|
</insert>
|
|
|
@ -217,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
|
|
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
|
|
|
<if test="remark != null">remark = #{remark},</if>
|
|
|
|
<if test="remark != null">remark = #{remark},</if>
|
|
|
|
<if test="wxId != null">wx_id = #{wxId},</if>
|
|
|
|
<if test="wxId != null">wx_id = #{wxId},</if>
|
|
|
|
|
|
|
|
<if test="userMType != null">user_m_type = #{userMType},</if>
|
|
|
|
update_time = GETDATE()
|
|
|
|
update_time = GETDATE()
|
|
|
|
</set>
|
|
|
|
</set>
|
|
|
|
where user_id = #{userId}
|
|
|
|
where user_id = #{userId}
|
|
|
|