|
@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="deptName" column="dept_name" />
|
|
|
<result property="qwUserId" column="qw_user_id" />
|
|
|
<result property="qwStatus" column="qw_status" />
|
|
|
+ <result property="domain" column="domain" />
|
|
|
<association property="dept" column="dept_id" javaType="CompanyDept" resultMap="deptResult" />
|
|
|
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
|
|
|
|
|
@@ -131,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="jpushId != null">jpush_id,</if>
|
|
|
<if test="qwUserId != null">qw_user_id,</if>
|
|
|
<if test="qwStatus != null">qw_status,</if>
|
|
|
+ <if test="domain != null">`domain`,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="companyId != null">#{companyId},</if>
|
|
@@ -160,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="jpushId != null">#{jpushId},</if>
|
|
|
<if test="qwUserId != null">#{qwUserId},</if>
|
|
|
<if test="qwStatus != null">#{qwStatus},</if>
|
|
|
+ <if test="domain != null">#{domain},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
@@ -192,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="jpushId != null">jpush_id = #{jpushId},</if>
|
|
|
<if test="qwUserId != null">qw_user_id = #{qwUserId},</if>
|
|
|
<if test="qwStatus != null">qw_status = #{qwStatus},</if>
|
|
|
+ <if test="domain != null">`domain` = #{domain},</if>
|
|
|
</trim>
|
|
|
where user_id = #{userId}
|
|
|
</update>
|
|
@@ -254,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
where u.user_name = #{userName}
|
|
|
</select>
|
|
|
<sql id="selectUserVo">
|
|
|
- select u.user_id,u.company_id,u.qw_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.id_card, u.remark,u.user_type,u.open_id,u.qr_code_weixin,u.qr_code_wecom,u.jpush_id,
|
|
|
+ select u.user_id,u.company_id,u.qw_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.id_card, u.remark,u.user_type,u.open_id,u.qr_code_weixin,u.qr_code_wecom,u.jpush_id,u.domain,
|
|
|
d.dept_id, d.parent_id, 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
|
|
|
from company_user u
|